diff --git a/test/meson.build b/test/meson.build
index 4e3fbab49..f20a79aa0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -24,6 +24,7 @@ gtest_dep = declare_dependency(
 )
 
 subdir('net')
+subdir('time')
 
 executable(
   'read_conf',
@@ -51,19 +52,6 @@ test('TestUtil', executable(
   ],
 ))
 
-test(
-  'TestTime',
-  executable(
-    'TestTime',
-    'TestISO8601.cxx',
-    include_directories: inc,
-    dependencies: [
-      time_dep,
-      gtest_dep,
-    ],
-  ),
-)
-
 test('TestRewindInputStream', executable(
   'TestRewindInputStream',
   'TestRewindInputStream.cxx',
diff --git a/test/TestISO8601.cxx b/test/time/TestISO8601.cxx
similarity index 100%
rename from test/TestISO8601.cxx
rename to test/time/TestISO8601.cxx
diff --git a/test/time/meson.build b/test/time/meson.build
new file mode 100644
index 000000000..0aba67ac2
--- /dev/null
+++ b/test/time/meson.build
@@ -0,0 +1,16 @@
+test_time_sources = [
+  'TestISO8601.cxx',
+]
+
+test(
+  'TestTime',
+  executable(
+    'TestTime',
+    test_time_sources,
+    include_directories: inc,
+    dependencies: [
+      time_dep,
+      gtest_dep,
+    ],
+  ),
+)