diff --git a/integration-cli/build_tests/TestBuildSixtySteps/Dockerfile b/integration-cli/build_tests/TestBuildSixtySteps/Dockerfile
deleted file mode 100644
index 6a2bcab301..0000000000
--- a/integration-cli/build_tests/TestBuildSixtySteps/Dockerfile
+++ /dev/null
@@ -1,60 +0,0 @@
-FROM scratch
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
-ADD foo /
diff --git a/integration-cli/build_tests/TestBuildSixtySteps/foo b/integration-cli/build_tests/TestBuildSixtySteps/foo
deleted file mode 100644
index 7898192261..0000000000
--- a/integration-cli/build_tests/TestBuildSixtySteps/foo
+++ /dev/null
@@ -1 +0,0 @@
-a
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index 95424b69cc..68b8b8e188 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -46,16 +46,18 @@ func TestBuildCacheADD(t *testing.T) {
 }
 
 func TestBuildSixtySteps(t *testing.T) {
-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestBuildSixtySteps")
-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "foobuildsixtysteps", ".")
-	errorOut(err, t, fmt.Sprintf("build failed to complete: %v %v", out, err))
-
-	if err != nil || exitCode != 0 {
-		t.Fatal("failed to build the image")
+	name := "foobuildsixtysteps"
+	defer deleteImages(name)
+	ctx, err := fakeContext("FROM scratch\n"+strings.Repeat("ADD foo /\n", 60),
+		map[string]string{
+			"foo": "test1",
+		})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := buildImageFromContext(name, ctx, true); err != nil {
+		t.Fatal(err)
 	}
-
-	deleteImages("foobuildsixtysteps")
-
 	logDone("build - build an image with sixty build steps")
 }