diff --git a/src/per_file.bzl b/src/per_file.bzl
index b1c0db57..e8e16933 100644
--- a/src/per_file.bzl
+++ b/src/per_file.bzl
@@ -47,7 +47,7 @@ def _run_code_checker(
         compilation_context,
         sources_and_headers):
     # Define Plist and log file names
-    data_dir = ctx.attr.name + "/data"
+    data_dir = ctx.attr.name + "/codechecker-files/data"
     file_name_params = (data_dir, src.path.replace("/", "-"))
     clang_tidy_plist_file_name = "{}/{}_clang-tidy.plist".format(*file_name_params)
     clangsa_plist_file_name = "{}/{}_clangsa.plist".format(*file_name_params)
@@ -243,8 +243,8 @@ def _per_file_impl(ctx):
             # ls -la $DATA_DIR/data
             # find $DATA_DIR/data -name *.plist -exec sed -i -e "s|<string>.*execroot/codechecker_bazel/|<string>|g" {{}} \\;
             # cat $DATA_DIR/data/test-src-lib.cc_clangsa.plist
-            echo "Running: CodeChecker parse $DATA_DIR/data"
-            $(realpath {codechecker}) parse $DATA_DIR/data
+            echo "Running: CodeChecker parse $DATA_DIR/codechecker-files/data"
+            $(realpath {codechecker}) parse $DATA_DIR/codechecker-files/data
         """.format(dirname = ctx.outputs.test_script.short_path, codechecker = info.codechecker.short_path),
     )
     files = depset(
diff --git a/test/unit/config/BUILD b/test/unit/config/BUILD
index e49ff138..c88c0e4a 100644
--- a/test/unit/config/BUILD
+++ b/test/unit/config/BUILD
@@ -118,7 +118,7 @@ unit_test(
         "CC_TEST_LIST=1; 2; 3;",
     ],
     data = [":per_file_env"],
-    files = "test/unit/config/per_file_env/data/test-unit-config-zero_div.cc_codechecker.log",
+    files = "test/unit/config/per_file_env/codechecker-files/data/test-unit-config-zero_div.cc_codechecker.log",
 )
 
 # None of these codechecker rules should find any issues
diff --git a/test/unit/generated_files/BUILD b/test/unit/generated_files/BUILD
index dedefc16..201a5a37 100644
--- a/test/unit/generated_files/BUILD
+++ b/test/unit/generated_files/BUILD
@@ -138,7 +138,7 @@ unit_test(
     ],
     data = [":per_file_genrule_header"],
     excludes = "genrule_source.cc",
-    files = "test/unit/generated_files/per_file_genrule_header/data/test-unit-generated_files-genrule_header_consumer.cc_clangsa.plist",
+    files = "test/unit/generated_files/per_file_genrule_header/codechecker-files/data/test-unit-generated_files-genrule_header_consumer.cc_clangsa.plist",
 )
 
 unit_test(
@@ -148,7 +148,7 @@ unit_test(
         "core.DivideZero",
     ],
     data = [":per_file_genrule_source"],
-    files = "test/unit/generated_files/per_file_genrule_source/data/bazel-out-k8-fastbuild-bin-test-unit-generated_files-genrule_source.cc_clangsa.plist",
+    files = "test/unit/generated_files/per_file_genrule_source/codechecker-files/data/bazel-out-k8-fastbuild-bin-test-unit-generated_files-genrule_source.cc_clangsa.plist",
 )
 
 unit_test(
diff --git a/test/unit/metadata/BUILD b/test/unit/metadata/BUILD
index 8c22096f..41988f85 100644
--- a/test/unit/metadata/BUILD
+++ b/test/unit/metadata/BUILD
@@ -64,7 +64,7 @@ unit_test(
     contains = [r"\"action_num\": 1,"],
     data = [":per_file_multiple_source"],
     files = [
-        "test/unit/metadata/per_file_multiple_source/data/test-unit-metadata-main.cc_metadata.json",
-        "test/unit/metadata/per_file_multiple_source/data/test-unit-metadata-other.cc_metadata.json",
+        "test/unit/metadata/per_file_multiple_source/codechecker-files/data/test-unit-metadata-main.cc_metadata.json",
+        "test/unit/metadata/per_file_multiple_source/codechecker-files/data/test-unit-metadata-other.cc_metadata.json",
     ],
 )
diff --git a/test/unit/skip/BUILD b/test/unit/skip/BUILD
index 003c8df0..de23cd6a 100644
--- a/test/unit/skip/BUILD
+++ b/test/unit/skip/BUILD
@@ -103,7 +103,7 @@ unit_test(
     contains = ["analyzed skip2.cc successfully"],
     data = [":per_file_skipfile_exact_file_path"],
     excludes = ["analyzed skip.cc successfully"],
-    files = ["test/unit/skip/per_file_skipfile_exact_file_path/data/*.log"],
+    files = ["test/unit/skip/per_file_skipfile_exact_file_path/codechecker-files/data/*.log"],
     require_patterns_in_each_file = False,
 )
 
@@ -112,7 +112,7 @@ unit_test(
     contains = ["analyzed skip2.cc successfully"],
     data = [":per_file_skipfile_folder_skip_path"],
     excludes = ["analyzed skip.cc successfully"],
-    files = ["test/unit/skip/per_file_skipfile_folder_skip_path/data/*.log"],
+    files = ["test/unit/skip/per_file_skipfile_folder_skip_path/codechecker-files/data/*.log"],
     require_patterns_in_each_file = False,
 )
 
@@ -121,6 +121,6 @@ unit_test(
     contains = ["analyzed skip.cc successfully"],
     data = [":per_file_skipfile_both_files_except_one"],
     excludes = ["analyzed skip2.cc successfully"],
-    files = ["test/unit/skip/per_file_skipfile_both_files_except_one/data/*.log"],
+    files = ["test/unit/skip/per_file_skipfile_both_files_except_one/codechecker-files/data/*.log"],
     require_patterns_in_each_file = False,
 )