@@ -460,6 +460,22 @@ func TestBuildMaintainer(t *testing.T) {

 	logDone("build - maintainer")

 }

+func TestBuildUser(t *testing.T) {

+	checkSimpleBuild(t,

+		`

+		FROM busybox

+		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd

+		USER dockerio

+		RUN [ $(whoami) = 'dockerio' ]

+		`,

+		"testbuildimg",

+		"{{json .config.User}}",

+		`"dockerio"`)

+

+	deleteImages("testbuildimg")

+	logDone("build - user")

+}

+

 // TODO: TestCaching

 // TODO: TestADDCacheInvalidation

@@ -414,20 +414,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u

 	return image, err

 }

-func TestBuildUser(t *testing.T) {

-	img, err := buildImage(testContextTemplate{`

-        from {IMAGE}

-        user dockerio

-    `, nil, nil}, t, nil, true)

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if img.Config.User != "dockerio" {

-		t.Fail()

-	}

-}

-

 func TestBuildRelativeWorkdir(t *testing.T) {

 	img, err := buildImage(testContextTemplate{`

 		FROM {IMAGE}