@@ -540,6 +540,20 @@ func TestBuildExpose(t *testing.T) {

 	logDone("build - expose")

 }

+func TestBuildEntrypoint(t *testing.T) {

+	checkSimpleBuild(t,

+		`

+        FROM scratch

+        ENTRYPOINT ["/bin/echo"]

+        `,

+		"testbuildimg",

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

+		`["/bin/echo"]`)

+

+	deleteImages("testbuildimg")

+	logDone("build - entrypoint")

+}

+

 // TODO: TestCaching

 // TODO: TestADDCacheInvalidation

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

 	return image, err

 }

-func TestBuildEntrypoint(t *testing.T) {

-	img, err := buildImage(testContextTemplate{`

-        from {IMAGE}

-        entrypoint ["/bin/echo"]

-        `,

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

-	if err != nil {

-		t.Fatal(err)

-	}

-

-	if img.Config.Entrypoint[0] != "/bin/echo" {

-		t.Log(img.Config.Entrypoint[0])

-		t.Fail()

-	}

-}

-

 // testing #1405 - config.Cmd does not get cleaned up if

 // utilizing cache

 func TestBuildEntrypointRunCleanup(t *testing.T) {