15 files changed, 38 insertions, 27 deletions
diff --git a/test/automated/display/meson.build b/test/automated/display/meson.build
new file mode 100644
index 000000000..1edd7b60d
--- /dev/null
+++ b/test/automated/display/meson.build
@@ -0,0 +1,12 @@
+tests = [
+  ['test-nautilus-search-engine', [
+    'test-nautilus-search-engine.c'
+  ]],
+  ['test-nautilus-directory-async', [
+    'test-nautilus-directory-async.c'
+  ]]
+]
+
+foreach t: tests
+  test(t[0], executable(t[0], t[1], dependencies: libnautilus_dep))
+endforeach
diff --git a/test/test-nautilus-directory-async.c b/test/automated/display/test-nautilus-directory-async.c
index 804c443cc..804c443cc 100644
--- a/test/test-nautilus-directory-async.c
+++ b/test/automated/display/test-nautilus-directory-async.c
diff --git a/test/test-nautilus-mime-actions-set.c b/test/automated/display/test-nautilus-mime-actions-set.c
index a08f817d6..a08f817d6 100644
--- a/test/test-nautilus-mime-actions-set.c
+++ b/test/automated/display/test-nautilus-mime-actions-set.c
diff --git a/test/test-nautilus-mime-actions.c b/test/automated/display/test-nautilus-mime-actions.c
index 38e140fd6..38e140fd6 100644
--- a/test/test-nautilus-mime-actions.c
+++ b/test/automated/display/test-nautilus-mime-actions.c
diff --git a/test/test-nautilus-search-engine.c b/test/automated/display/test-nautilus-search-engine.c
index 2ed8af77e..2ed8af77e 100644
--- a/test/test-nautilus-search-engine.c
+++ b/test/automated/display/test-nautilus-search-engine.c
diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
new file mode 100644
index 000000000..fc8570f3c
--- /dev/null
+++ b/test/automated/displayless/meson.build
@@ -0,0 +1,12 @@
+tests = [
+  ['test-file-utilities-get-common-filename-prefix', [
+    'test-file-utilities-get-common-filename-prefix.c'
+  ]],
+  ['test-eel-string-get-common-prefix', [
+    'test-eel-string-get-common-prefix.c'
+  ]]
+]
+
+foreach t: tests
+  test(t[0], executable(t[0], t[1], dependencies: libnautilus_dep))
+endforeach
diff --git a/test/test-eel-string-get-common-prefix.c b/test/automated/displayless/test-eel-string-get-common-prefix.c
index 2dc5d9e9a..2dc5d9e9a 100644
--- a/test/test-eel-string-get-common-prefix.c
+++ b/test/automated/displayless/test-eel-string-get-common-prefix.c
diff --git a/test/test-file-utilities-get-common-filename-prefix.c b/test/automated/displayless/test-file-utilities-get-common-filename-prefix.c
index 0d78b97ee..0d78b97ee 100644
--- a/test/test-file-utilities-get-common-filename-prefix.c
+++ b/test/automated/displayless/test-file-utilities-get-common-filename-prefix.c
diff --git a/test/automated/meson.build b/test/automated/meson.build
new file mode 100644
index 000000000..f71d0e884
--- /dev/null
+++ b/test/automated/meson.build
@@ -0,0 +1,4 @@
+subdir('displayless')
+if get_option('display-tests')
+  subdir('display')
+endif
diff --git a/test/file-torture.py b/test/interactive/file-torture.py
index 865795ff1..865795ff1 100644
--- a/test/file-torture.py
+++ b/test/interactive/file-torture.py
diff --git a/test/interactive/meson.build b/test/interactive/meson.build
new file mode 100644
index 000000000..eb8cf8ae6
--- /dev/null
+++ b/test/interactive/meson.build
@@ -0,0 +1,8 @@
+test_copy = executable(
+  'test-copy', [
+    'test-copy.c',
+    'test.c',
+    'test.h'
+  ],
+  dependencies: libnautilus_dep
+)
diff --git a/test/test-copy.c b/test/interactive/test-copy.c
index 45cb8d168..45cb8d168 100644
--- a/test/test-copy.c
+++ b/test/interactive/test-copy.c
diff --git a/test/test.c b/test/interactive/test.c
index 43e8fbc43..43e8fbc43 100644
--- a/test/test.c
+++ b/test/interactive/test.c
diff --git a/test/test.h b/test/interactive/test.h
index 8d9b8a293..8d9b8a293 100644
--- a/test/test.h
+++ b/test/interactive/test.h
diff --git a/test/meson.build b/test/meson.build
index 928f9b157..6fd5e6005 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -1,27 +1,2 @@
-test_copy = executable(
-  'test-copy', [
-    'test-copy.c',
-    'test.c',
-    'test.h'
-  ],
-  dependencies: libnautilus_dep
-)
-
-tests = [
-  ['test-nautilus-search-engine', [
-    'test-nautilus-search-engine.c'
-  ]],
-  ['test-nautilus-directory-async', [
-    'test-nautilus-directory-async.c'
-  ]],
-  ['test-file-utilities-get-common-filename-prefix', [
-    'test-file-utilities-get-common-filename-prefix.c'
-  ]],
-  ['test-eel-string-get-common-prefix', [
-    'test-eel-string-get-common-prefix.c'
-  ]]
-]
-
-foreach t: tests
-  test(t[0], executable(t[0], t[1], dependencies: libnautilus_dep))
-endforeach
+subdir('automated')
+subdir('interactive')