diff --git a/shared/meson.build b/shared/meson.build
index af903d3c8a..d542804eb4 100644
--- a/shared/meson.build
+++ b/shared/meson.build
@@ -330,24 +330,6 @@ libnm_systemd_shared_no_logging_dep = declare_dependency(
   ],
 )
 
-###############################################################################
-
-exe = executable(
-    'nm-utils/tests/test-shared-general',
-    [ 'nm-utils/tests/test-shared-general.c' ],
-    c_args: [
-        '-DNETWORKMANAGER_COMPILATION_TEST',
-        '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
-    ],
-    dependencies: [
-        shared_nm_glib_aux_dep,
-        libnm_systemd_shared_no_logging_dep,
-        shared_c_siphash_dep,
-    ],
-)
-
-test(
-    'shared/nm-utils/tests/test-shared-general',
-    test_script,
-    args: test_args + [exe.full_path()]
-)
+if enable_tests
+  subdir('nm-utils/tests')
+endif
diff --git a/shared/nm-utils/tests/meson.build b/shared/nm-utils/tests/meson.build
new file mode 100644
index 0000000000..e0560f296d
--- /dev/null
+++ b/shared/nm-utils/tests/meson.build
@@ -0,0 +1,22 @@
+test_unit = 'test-shared-general'
+
+exe = executable(
+  test_unit,
+  test_unit + '.c',
+  c_args: [
+    '-DNETWORKMANAGER_COMPILATION_TEST',
+    '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_PROG)',
+  ],
+  dependencies: [
+    shared_nm_glib_aux_dep,
+    libnm_systemd_shared_no_logging_dep,
+    shared_c_siphash_dep,
+  ],
+)
+
+test(
+  'shared/nm-utils/' + test_unit,
+  test_script,
+  args: test_args + [exe.full_path()],
+  timeout: default_test_timeout,
+)