@@ -531,6 +531,10 @@ func (s *DockerSuite) TestBuildCacheAdd(c *check.C) {

 }

 func (s *DockerSuite) TestBuildLastModified(c *check.C) {

+	// Temporary fix for #30890. TODO @jhowardmsft figure out what

+	// has changed in the master busybox image.

+	testRequires(c, DaemonIsLinux)

+

 	name := "testbuildlastmodified"

 	server, err := fakeStorage(map[string]string{

@@ -3647,6 +3651,7 @@ RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1042:1043/10

 	}

 }

+// FIXME(vdemeester) rename this test (and probably "merge" it with the one below TestBuildEnvUsage2)

 func (s *DockerSuite) TestBuildEnvUsage(c *check.C) {

 	// /docker/world/hello is not owned by the correct user

 	testRequires(c, NotUserNamespace)

@@ -3685,6 +3690,7 @@ RUN    [ "$ghi" = "def" ]

 	}

 }

+// FIXME(vdemeester) rename this test (and probably "merge" it with the one above TestBuildEnvUsage)

 func (s *DockerSuite) TestBuildEnvUsage2(c *check.C) {

 	// /docker/world/hello is not owned by the correct user

 	testRequires(c, NotUserNamespace)

@@ -4811,6 +4817,7 @@ CMD cat /foo/file`,

 }

+// FIXME(vdemeester) part of this should be unit test, other part should be clearer

 func (s *DockerSuite) TestBuildRenamedDockerfile(c *check.C) {

 	ctx, err := fakeContext(`FROM busybox