diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index 8b46357a80..bebb691bd2 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -1273,3 +1273,17 @@ func TestBuildFails(t *testing.T) {
 	}
 	logDone("build - fails")
 }
+
+func TestBuildFailsDockerfileEmpty(t *testing.T) {
+	name := "testbuildfails"
+	defer deleteImages(name)
+	_, err := buildImage(name, ``, true)
+	if err != nil {
+		if !strings.Contains(err.Error(), "Dockerfile cannot be empty") {
+			t.Fatalf("Wrong error %v, must be about empty Dockerfile", err)
+		}
+	} else {
+		t.Fatal("Error must not be nil")
+	}
+	logDone("build - fails with empty dockerfile")
+}
diff --git a/integration/buildfile_test.go b/integration/buildfile_test.go
index 833d2b6789..231aa9975f 100644
--- a/integration/buildfile_test.go
+++ b/integration/buildfile_test.go
@@ -413,14 +413,6 @@ func buildImage(context testContextTemplate, t *testing.T, eng *engine.Engine, u
 	return image, err
 }
 
-func TestBuildFailsDockerfileEmpty(t *testing.T) {
-	_, err := buildImage(testContextTemplate{``, nil, nil}, t, nil, true)
-
-	if err != server.ErrDockerfileEmpty {
-		t.Fatal("Expected: %v, got: %v", server.ErrDockerfileEmpty, err)
-	}
-}
-
 func TestBuildOnBuildTrigger(t *testing.T) {
 	_, err := buildImage(testContextTemplate{`
 	from {IMAGE}