diff --git a/integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile b/integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile
deleted file mode 100644
index 58c75b00f3..0000000000
--- a/integration-cli/build_tests/TestAdd/EtcToRoot/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM scratch
-ADD . /
diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go
index fbc5feea83..54ceb4ba81 100644
--- a/integration-cli/docker_cli_build_test.go
+++ b/integration-cli/docker_cli_build_test.go
@@ -301,16 +301,21 @@ func TestBuildAddWholeDirToRoot(t *testing.T) {
 	logDone("build - add whole directory to root")
 }
 
+// Testing #5941
 func TestBuildAddEtcToRoot(t *testing.T) {
-	buildDirectory := filepath.Join(workingDirectory, "build_tests", "TestAdd")
-	out, exitCode, err := dockerCmdInDir(t, buildDirectory, "build", "-t", "testaddimg", "EtcToRoot")
-	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 := "testaddetctoroot"
+	defer deleteImages(name)
+	ctx, err := fakeContext(`FROM scratch
+ADD . /`,
+		map[string]string{
+			"etc/test_file": "test1",
+		})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := buildImageFromContext(name, ctx, true); err != nil {
+		t.Fatal(err)
 	}
-
-	deleteImages("testaddimg")
 	logDone("build - add etc directory to root")
 }