diff --git a/test/TestFs.cxx b/test/fs/TestFs.cxx
similarity index 100%
rename from test/TestFs.cxx
rename to test/fs/TestFs.cxx
diff --git a/test/TestLookupFile.cxx b/test/fs/TestLookupFile.cxx
similarity index 100%
rename from test/TestLookupFile.cxx
rename to test/fs/TestLookupFile.cxx
diff --git a/test/fs/meson.build b/test/fs/meson.build
new file mode 100644
index 000000000..e141cbecc
--- /dev/null
+++ b/test/fs/meson.build
@@ -0,0 +1,14 @@
+test(
+  'TestFs',
+  executable(
+    'TestFs',
+    'TestFs.cxx',
+    'TestLookupFile.cxx',
+    include_directories: inc,
+    dependencies: [
+      fs_dep,
+      gtest_dep,
+    ],
+  ),
+  protocol: 'gtest',
+)
diff --git a/test/meson.build b/test/meson.build
index 841e95447..b10e52ae2 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -85,21 +85,6 @@ test(
   protocol: 'gtest',
 )
 
-test(
-  'TestFs',
-  executable(
-    'TestFs',
-    'TestFs.cxx',
-    'TestLookupFile.cxx',
-    include_directories: inc,
-    dependencies: [
-      fs_dep,
-      gtest_dep,
-    ],
-  ),
-  protocol: 'gtest',
-)
-
 test(
   'TestIcu',
   executable(
@@ -644,3 +629,5 @@ if alsa_dep.found()
     ],
   )
 endif
+
+subdir('fs')