diff --git a/audio/BUILD.gn b/audio/BUILD.gn
index 39a1db3d07..b086971785 100644
--- a/audio/BUILD.gn
+++ b/audio/BUILD.gn
@@ -179,6 +179,7 @@ if (rtc_include_tests) {
         "../common_audio",
         "../rtc_base:rtc_base_approved",
         "../system_wrappers",
+        "../test:fileutils",
         "../test:test_common",
         "../test:test_main",
         "//testing/gtest",
@@ -230,6 +231,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_approved",
       "../system_wrappers",
       "../test:field_trial",
+      "../test:fileutils",
       "../test:single_threaded_task_queue",
       "../test:test_common",
       "../test:test_main",
diff --git a/call/BUILD.gn b/call/BUILD.gn
index 4b6da96ddd..eeb82e85f6 100644
--- a/call/BUILD.gn
+++ b/call/BUILD.gn
@@ -326,6 +326,7 @@ if (rtc_include_tests) {
       "../system_wrappers:runtime_enabled_features_default",
       "../test:direct_transport",
       "../test:field_trial",
+      "../test:fileutils",
       "../test:perf_test",
       "../test:test_common",
       "../test:test_support",
diff --git a/common_audio/BUILD.gn b/common_audio/BUILD.gn
index 736125ba12..13b1e5588e 100644
--- a/common_audio/BUILD.gn
+++ b/common_audio/BUILD.gn
@@ -456,6 +456,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers:cpu_features_api",
+      "../test:fileutils",
       "../test:test_main",
       "//testing/gtest",
     ]
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index 7b91b0074d..bd4c5f7503 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -115,6 +115,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base",
       "../rtc_base:rtc_base_approved",
       "../system_wrappers:system_wrappers",
+      "../test:fileutils",
       "../test:test_main",
       "../test:video_test_common",
       "//testing/gtest",
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index d5d7e55ed7..7b83c378cd 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -316,6 +316,7 @@ if (rtc_enable_protobuf) {
         "../rtc_base:checks",
         "../rtc_base:rtc_base_approved",
         "../rtc_base:rtc_base_tests_utils",
+        "../test:fileutils",
         "../test:test_support",
         "//testing/gtest",
       ]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 760c89af05..c20bd2bcc7 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1378,6 +1378,7 @@ if (rtc_include_tests) {
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
+      "../../test:fileutils",
       "../../test:test_support",
     ]
     defines = audio_coding_defines
@@ -1411,6 +1412,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:field_trial_api",
+      "../../test:fileutils",
       "../../test:perf_test",
       "../../test:test_support",
     ]
@@ -1485,6 +1487,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
+      "../../test:fileutils",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
@@ -1516,6 +1519,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
+      "../../test:fileutils",
       "../../test:test_support",
       "../rtp_rtcp",
       "//testing/gtest",
@@ -1546,7 +1550,9 @@ if (rtc_include_tests) {
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
-    deps = []
+    deps = [
+      "../../test:fileutils",
+    ]
 
     defines = neteq_defines
 
@@ -1591,6 +1597,7 @@ if (rtc_include_tests) {
         "..:module_api",
         "../..:typedefs",
         "../../rtc_base:checks",
+        "../../test:fileutils",
       ]
       sources = [
         "neteq/tools/neteq_rtpplay.cc",
@@ -1640,6 +1647,7 @@ if (rtc_include_tests) {
     defines = []
     deps = [
       "../..:typedefs",
+      "../../test:fileutils",
     ]
     sources = [
       "codecs/isac/fix/test/isac_speed_test.cc",
@@ -1705,6 +1713,7 @@ if (rtc_include_tests) {
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
+      "../../test:fileutils",
       "../../test:test_support",
       "//testing/gtest",
     ]
@@ -1731,6 +1740,7 @@ if (rtc_include_tests) {
       "../../api/audio_codecs:builtin_audio_decoder_factory",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_support",
       "//testing/gtest",
     ]
@@ -1848,6 +1858,7 @@ if (rtc_include_tests) {
       "../..:webrtc_common",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
+      "../../test:fileutils",
       "../../test:test_support",
     ]
   }
@@ -1868,6 +1879,7 @@ if (rtc_include_tests) {
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers:system_wrappers_default",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
@@ -1903,6 +1915,7 @@ if (rtc_include_tests) {
       ":neteq_quality_test_support",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
@@ -1921,6 +1934,7 @@ if (rtc_include_tests) {
       ":pcm16b",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
@@ -2082,6 +2096,7 @@ if (rtc_include_tests) {
       ":webrtc_opus",
       "../../common_audio",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
@@ -2220,6 +2235,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:cpu_features_api",
       "../../test:audio_codec_mocks",
       "../../test:field_trial",
+      "../../test:fileutils",
       "../../test:rtp_test_utils",
       "../../test:test_common",
       "../../test:test_support",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 84d70ec7db..81b7454081 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -400,6 +400,7 @@ if (rtc_include_tests) {
         "../../rtc_base:rtc_base_approved",
         "../../sdk:audio_objc",
         "../../system_wrappers",
+        "../../test:fileutils",
         "../../test:test_support",
         "//third_party/ocmock",
       ]
@@ -428,6 +429,7 @@ if (rtc_include_tests) {
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
+      "../../test:fileutils",
       "../../test:test_support",
       "../utility:utility",
     ]
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index 6e6ce30c3a..09b0bd4122 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -541,6 +541,7 @@ if (rtc_include_tests) {
       "../../rtc_base:safe_minmax",
       "../../system_wrappers",
       "../../system_wrappers:cpu_features_api",
+      "../../test:fileutils",
       "../../test:test_support",
       "../audio_coding:neteq_input_audio_tools",
       "aec_dump:mock_aec_dump_unittests",
@@ -650,6 +651,7 @@ if (rtc_include_tests) {
       ":audio_processing",
       ":file_audio_generator",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_support",
     ]
   }
@@ -743,6 +745,7 @@ if (rtc_include_tests) {
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
+      "../../test:fileutils",
       "../../test:test_support",
       "../audio_coding:neteq_input_audio_tools",
       "//testing/gtest",
@@ -765,6 +768,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../system_wrappers:metrics_default",
+      "../../test:fileutils",
       "../../test:test_support",
       "//testing/gtest",
     ]
diff --git a/modules/audio_processing/aec_dump/BUILD.gn b/modules/audio_processing/aec_dump/BUILD.gn
index b6a9dd34ab..7afaaf4515 100644
--- a/modules/audio_processing/aec_dump/BUILD.gn
+++ b/modules/audio_processing/aec_dump/BUILD.gn
@@ -84,6 +84,7 @@ if (rtc_enable_protobuf) {
       "..:audioproc_debug_proto",
       "../../../modules:module_api",
       "../../../rtc_base:rtc_task_queue",
+      "../../../test:fileutils",
       "../../../test:test_support",
       "//testing/gtest",
     ]
diff --git a/modules/audio_processing/test/conversational_speech/BUILD.gn b/modules/audio_processing/test/conversational_speech/BUILD.gn
index 8f13d27a97..b1cb079b24 100644
--- a/modules/audio_processing/test/conversational_speech/BUILD.gn
+++ b/modules/audio_processing/test/conversational_speech/BUILD.gn
@@ -23,6 +23,7 @@ rtc_executable("conversational_speech_generator") {
   deps = [
     ":lib",
     "../../../../rtc_base:rtc_base_approved",
+    "../../../../test:fileutils",
     "../../../../test:test_support",
   ]
 }
@@ -71,6 +72,7 @@ rtc_source_set("unittest") {
     "../../../../api:optional",
     "../../../../common_audio",
     "../../../../rtc_base:rtc_base_approved",
+    "../../../../test:fileutils",
     "../../../../test:test_support",
     "//testing/gtest",
   ]
diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn
index b7363e386f..9976b780e5 100644
--- a/modules/audio_processing/vad/BUILD.gn
+++ b/modules/audio_processing/vad/BUILD.gn
@@ -62,6 +62,7 @@ if (rtc_include_tests) {
       ":vad",
       "../..:module_api",
       "../../../common_audio",
+      "../../../test:fileutils",
       "../../../test:test_support",
       "//testing/gmock",
       "//testing/gtest",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index c4c7515ed3..902afa59c7 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -147,6 +147,7 @@ if (rtc_include_tests) {
       "../../rtc_base/system:fallthrough",
       "../../system_wrappers",
       "../../system_wrappers:field_trial_api",
+      "../../test:fileutils",
       "../../test:perf_test",
       "../../test:test_support",
       "../bitrate_controller",
@@ -173,6 +174,7 @@ if (rtc_include_tests) {
       ":remote_bitrate_estimator",
       "../../rtc_base:rtc_base_approved",
       "../../test:field_trial",
+      "../../test:fileutils",
       "../../test:test_support",
     ]
     if (!build_with_chromium && is_clang) {
@@ -210,6 +212,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:field_trial",
+      "../../test:fileutils",
       "../../test:test_support",
       "../pacing:pacing",
       "../rtp_rtcp:rtp_rtcp_format",
@@ -237,6 +240,7 @@ if (rtc_include_tests) {
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 8e1c2326f2..4d8ca72d91 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -302,6 +302,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":rtp_rtcp",
+      "../../test:fileutils",
       "../../test:test_main",
       "//testing/gtest",
     ]
@@ -317,6 +318,7 @@ if (rtc_include_tests) {
       ":rtp_rtcp",
       ":rtp_rtcp_format",
       "../../rtc_base:rtc_base_approved",
+      "../../test:fileutils",
       "../../test:test_support",
     ]
   }
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 8e92cbe3e1..0a90141117 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -590,6 +590,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_task_queue",
       "../../rtc_base:sequenced_task_checker",
       "../../system_wrappers",
+      "../../test:fileutils",
       "../../test:test_common",
       "../../test:test_support",
       "../../test:video_test_common",
@@ -660,6 +661,7 @@ if (rtc_include_tests) {
       "../../rtc_base:rtc_base_tests_utils",
       "../../system_wrappers",
       "../../test:field_trial",
+      "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
@@ -769,6 +771,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:metrics_api",
       "../../system_wrappers:metrics_default",
       "../../test:field_trial",
+      "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index 351e5792f8..d0f995c009 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -112,6 +112,7 @@ if (rtc_include_tests) {
     deps = [
       ":video_processing",
       "../../common_video:common_video",
+      "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",
     ]
diff --git a/pc/BUILD.gn b/pc/BUILD.gn
index 54bf0c7070..592f574eb8 100644
--- a/pc/BUILD.gn
+++ b/pc/BUILD.gn
@@ -479,6 +479,7 @@ if (rtc_include_tests) {
       "../api:mock_rtp",
       "../rtc_base:checks",
       "../rtc_base:stringutils",
+      "../test:fileutils",
     ]
     if (is_android) {
       deps += [ ":android_black_magic" ]
diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index b4f2c1755b..50e0b2499b 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -926,6 +926,7 @@ if (rtc_include_tests) {
       ":rtc_base_tests_utils",
       "../system_wrappers:field_trial_default",
       "../test:field_trial",
+      "../test:fileutils",
       "../test:test_support",
     ]
 
@@ -952,6 +953,7 @@ if (rtc_include_tests) {
       ":rtc_base_tests_main",
       ":rtc_base_tests_utils",
       "../system_wrappers:system_wrappers",
+      "../test:fileutils",
       "../test:test_support",
       "//testing/gtest",
     ]
@@ -1020,6 +1022,7 @@ if (rtc_include_tests) {
       ":stringutils",
       "../api:array_view",
       "../system_wrappers:system_wrappers",
+      "../test:fileutils",
       "../test:test_support",
     ]
   }
@@ -1146,6 +1149,7 @@ if (rtc_include_tests) {
       ":stringutils",
       "../api:array_view",
       "../api:optional",
+      "../test:fileutils",
       "../test:test_support",
     ]
     public_deps = [
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 13abc70049..f57ef40fdb 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -272,6 +272,7 @@ if (rtc_include_tests) {
         "../rtc_base:rtc_base_approved",
         "../system_wrappers:field_trial_default",
         "../test:field_trial",
+        "../test:fileutils",
         "../test:test_support",
       ]
     }
@@ -344,6 +345,7 @@ if (rtc_include_tests) {
       "../common_video:common_video",
       "../rtc_base",
       "../rtc_base:checks",
+      "../test:fileutils",
       "../test:test_main",
       "//testing/gtest",
     ]
diff --git a/rtc_tools/network_tester/BUILD.gn b/rtc_tools/network_tester/BUILD.gn
index 4d2d2093a9..67c9357c99 100644
--- a/rtc_tools/network_tester/BUILD.gn
+++ b/rtc_tools/network_tester/BUILD.gn
@@ -81,6 +81,7 @@ if (rtc_enable_protobuf) {
     deps = [
       ":network_tester",
       "../../rtc_base:rtc_base_tests_utils",
+      "../../test:fileutils",
       "../../test:test_support",
       "//testing/gtest",
     ]
diff --git a/test/BUILD.gn b/test/BUILD.gn
index d47e6bc25c..b4598531ba 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -175,9 +175,7 @@ rtc_source_set("test_support") {
     "testsupport/unittest_utils.h",
   ]
 
-  public_deps = [
-    ":fileutils",
-  ]
+  public_deps = []
   if (is_ios) {
     public_deps += [ ":test_support_objc" ]
   }
@@ -221,6 +219,7 @@ if (rtc_include_tests) {
     ]
     deps = [
       ":field_trial",
+      ":fileutils",
       ":perf_test",
       "../rtc_base:rtc_base_approved",
       "../system_wrappers:field_trial_default",
@@ -243,6 +242,7 @@ if (rtc_include_tests) {
     ]
 
     deps = [
+      ":fileutils",
       ":test_support",
       ":video_test_common",
       "..:webrtc_common",
@@ -264,10 +264,6 @@ if (rtc_include_tests) {
       sources += [ "testsupport/jpeg_frame_writer_ios.cc" ]
     }
 
-    public_deps = [
-      ":fileutils",
-    ]
-
     if (!build_with_chromium && is_clang) {
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
@@ -320,6 +316,7 @@ if (rtc_include_tests) {
 
   rtc_test("test_support_unittests") {
     deps = [
+      ":fileutils",
       ":perf_test",
       ":rtp_test_utils",
       "../api:video_frame_api",
@@ -395,12 +392,7 @@ if (is_ios) {
 
 rtc_source_set("fileutils") {
   testonly = true
-  visibility = [
-    ":fileutils_unittests",
-    ":test_support_test_artifacts",
-    ":test_support",
-    ":video_test_support",
-  ]
+  visibility = [ "*" ]
   sources = [
     "testsupport/fileutils.cc",
     "testsupport/fileutils.h",
@@ -561,6 +553,7 @@ rtc_source_set("test_common") {
 
   deps = [
     ":direct_transport",
+    ":fileutils",
     ":rtp_test_utils",
     ":test_support",
     ":video_test_common",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index fc2a750bdd..35d9ffe4e3 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -124,6 +124,7 @@ if (rtc_include_tests) {
       "../rtc_base:rtc_base_approved",
       "../rtc_base:rtc_base_tests_utils",
       "../system_wrappers",
+      "../test:fileutils",
       "../test:perf_test",
       "../test:rtp_test_utils",
       "../test:test_common",
@@ -357,6 +358,7 @@ if (rtc_include_tests) {
       "../system_wrappers:metrics_default",
       "../test:direct_transport",
       "../test:field_trial",
+      "../test:fileutils",
       "../test:perf_test",
       "../test:rtp_test_utils",
       "../test:test_common",