diff --git a/src/contrib/tests/meson.build b/src/contrib/tests/meson.build
index 0356a03f81..b9b22ca885 100644
--- a/src/contrib/tests/meson.build
+++ b/src/contrib/tests/meson.build
@@ -5,7 +5,7 @@ static_library(
   'nm-vpn-plugin-utils-test',
   sources: nm_vpn_plugin_utils_source,
   dependencies: [
-    libnm_client_public_dep,
+    libnm_dep,
     glib_dep,
   ],
 )
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index b411ad4067..3f2e78a74f 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -38,7 +38,7 @@ foreach test_unit: test_units
   )
 
   test(
-    test_unit,
+    'src/libnm-client-impl/tests/' + test_unit,
     test_script,
     timeout: 90,
     args: test_args + [exe.full_path()],
diff --git a/src/libnm-core-impl/tests/meson.build b/src/libnm-core-impl/tests/meson.build
index d498c430b6..ca1d1c1aa6 100644
--- a/src/libnm-core-impl/tests/meson.build
+++ b/src/libnm-core-impl/tests/meson.build
@@ -41,7 +41,7 @@ foreach test_unit: test_units
   )
 
   test(
-    'libnm-core/' + test_unit,
+    'src/libnm-core-impl/tests/' + test_unit,
     test_script,
     args: test_args + [exe.full_path()],
     timeout: default_test_timeout,
diff --git a/src/libnm-glib-aux/tests/meson.build b/src/libnm-glib-aux/tests/meson.build
index 58b9a29b08..0ec4ad301b 100644
--- a/src/libnm-glib-aux/tests/meson.build
+++ b/src/libnm-glib-aux/tests/meson.build
@@ -3,11 +3,13 @@
 exe = executable(
   'test-shared-general',
   'test-shared-general.c',
-  dependencies: glib_dep,
   include_directories: [
     src_inc,
     top_inc,
   ],
+  dependencies: [
+    glib_dep,
+  ],
   link_with: [
     libnm_log_null,
     libnm_glib_aux,
@@ -17,7 +19,7 @@ exe = executable(
 )
 
 test(
-  'shared/nm-glib-aux/test-shared-general',
+  'src/libnm-glib-aux/tests/test-shared-general',
   test_script,
   args: test_args + [exe.full_path()],
   timeout: default_test_timeout,
@@ -45,7 +47,7 @@ if jansson_dep.found()
   )
 
   test(
-    'shared/nm-glib-aux/test-json-aux',
+    'src/libnm-glib-aux/tests/test-json-aux',
     test_script,
     args: test_args + [exe.full_path()],
     timeout: default_test_timeout,
diff --git a/src/libnm-platform/tests/meson.build b/src/libnm-platform/tests/meson.build
index dedb60c91b..bec385eb49 100644
--- a/src/libnm-platform/tests/meson.build
+++ b/src/libnm-platform/tests/meson.build
@@ -3,14 +3,14 @@
 exe = executable(
   'test-nm-platform',
   'test-nm-platform.c',
-  dependencies: [
-    glib_dep,
-    libudev_dep,
-  ],
   include_directories: [
     src_inc,
     top_inc,
   ],
+  dependencies: [
+    glib_dep,
+    libudev_dep,
+  ],
   link_with: [
     libnm_platform,
     libnm_base,
@@ -23,7 +23,7 @@ exe = executable(
 )
 
 test(
-  'shared/nm-glib-aux/test-nm-platform',
+  'src/libnm-platform/tests/test-nm-platform',
   test_script,
   args: test_args + [exe.full_path()],
   timeout: default_test_timeout,