diff --git a/util/file/filesystem_test_util.cc b/test/filesystem.cc
similarity index 99%
rename from util/file/filesystem_test_util.cc
rename to test/filesystem.cc
index 5d991ee7..a9a73f6a 100644
--- a/util/file/filesystem_test_util.cc
+++ b/test/filesystem.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/file/filesystem_test_util.h"
+#include "test/filesystem.h"
 
 #include <errno.h>
 #include <sys/stat.h>
diff --git a/util/file/filesystem_test_util.h b/test/filesystem.h
similarity index 93%
rename from util/file/filesystem_test_util.h
rename to test/filesystem.h
index b74653f1..7e658456 100644
--- a/util/file/filesystem_test_util.h
+++ b/test/filesystem.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef CRASHPAD_UTIL_FILE_FILESYSTEM_TEST_UTIL_H_
-#define CRASHPAD_UTIL_FILE_FILESYSTEM_TEST_UTIL_H_
+#ifndef CRASHPAD_TEST_FILESYSTEM_H_
+#define CRASHPAD_TEST_FILESYSTEM_H_
 
 #include "base/files/file_path.h"
 
@@ -56,4 +56,4 @@ bool CreateSymbolicLink(const base::FilePath& target_path,
 }  // namespace test
 }  // namespace crashpad
 
-#endif  // CRASHPAD_UTIL_FILE_FILESYSTEM_TEST_UTIL_H_
+#endif  // CRASHPAD_TEST_FILESYSTEM_H_
diff --git a/test/test.gyp b/test/test.gyp
index 931d9485..4b389334 100644
--- a/test/test.gyp
+++ b/test/test.gyp
@@ -35,6 +35,8 @@
         'errors.h',
         'file.cc',
         'file.h',
+        'filesystem.cc',
+        'filesystem.h',
         'gtest_death_check.h',
         'gtest_disabled.cc',
         'gtest_disabled.h',
diff --git a/util/file/directory_reader_test.cc b/util/file/directory_reader_test.cc
index 640b850f..f03669e2 100644
--- a/util/file/directory_reader_test.cc
+++ b/util/file/directory_reader_test.cc
@@ -21,11 +21,11 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
+#include "test/filesystem.h"
 #include "test/gtest_disabled.h"
 #include "test/scoped_temp_dir.h"
 #include "util/file/file_io.h"
 #include "util/file/filesystem.h"
-#include "util/file/filesystem_test_util.h"
 
 namespace crashpad {
 namespace test {
diff --git a/util/file/filesystem_test.cc b/util/file/filesystem_test.cc
index 8657e5b0..7e28892e 100644
--- a/util/file/filesystem_test.cc
+++ b/util/file/filesystem_test.cc
@@ -17,9 +17,9 @@
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "gtest/gtest.h"
+#include "test/filesystem.h"
 #include "test/gtest_disabled.h"
 #include "test/scoped_temp_dir.h"
-#include "util/file/filesystem_test_util.h"
 
 namespace crashpad {
 namespace test {
diff --git a/util/util_test.gyp b/util/util_test.gyp
index ede3259b..152c981a 100644
--- a/util/util_test.gyp
+++ b/util/util_test.gyp
@@ -40,8 +40,6 @@
         'file/file_io_test.cc',
         'file/file_reader_test.cc',
         'file/filesystem_test.cc',
-        'file/filesystem_test_util.cc',
-        'file/filesystem_test_util.h',
         'file/string_file_test.cc',
         'linux/auxiliary_vector_test.cc',
         'linux/memory_map_test.cc',