diff --git a/.gitignore b/.gitignore
index b7051afd5b..fa4a67c554 100644
--- a/.gitignore
+++ b/.gitignore
@@ -226,8 +226,8 @@ test-*.trs
 /src/supplicant/tests/test-supplicant-config
 /src/tests/config/test-config
 /src/tests/test-dcb
-/src/tests/test-general
-/src/tests/test-general-with-expect
+/src/tests/test-core
+/src/tests/test-core-with-expect
 /src/tests/test-ip4-config
 /src/tests/test-ip6-config
 /src/tests/test-route-manager-fake
@@ -319,4 +319,6 @@ test-*.trs
 /src/settings/plugins/ifnet
 /src/settings/plugins/keyfile/tests/test-keyfile
 /src/supplicant-manager/tests/test-supplicant-config
+/src/tests/test-general
+/src/tests/test-general-with-expect
 /src/tests/test-resolvconf-capture
diff --git a/Makefile.am b/Makefile.am
index 455ea3127e..a8e67e720a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3747,8 +3747,8 @@ src_tests_ldadd = \
 	src/libNetworkManagerTest.la
 
 check_programs += \
-	src/tests/test-general \
-	src/tests/test-general-with-expect \
+	src/tests/test-core \
+	src/tests/test-core-with-expect \
 	src/tests/test-ip4-config \
 	src/tests/test-ip6-config \
 	src/tests/test-dcb \
@@ -3768,13 +3768,13 @@ src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
 src_tests_test_dcb_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_LDADD = $(src_tests_ldadd)
+src_tests_test_core_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_LDADD = $(src_tests_ldadd)
 
-src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
-src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
-src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
+src_tests_test_core_with_expect_CPPFLAGS = $(src_cppflags_test)
+src_tests_test_core_with_expect_LDFLAGS = $(src_tests_ldflags)
+src_tests_test_core_with_expect_LDADD = $(src_tests_ldadd)
 
 src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
 src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
@@ -3787,8 +3787,8 @@ src_tests_test_utils_LDADD = $(src_tests_ldadd)
 $(src_tests_test_ip4_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_ip6_config_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_dcb_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
-$(src_tests_test_general_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
+$(src_tests_test_core_with_expect_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_wired_defname_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 $(src_tests_test_utils_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
 
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 17857676b3..b2bc13ab37 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -1,8 +1,8 @@
 subdir('config')
 
 test_units = [
-  'test-general',
-  'test-general-with-expect',
+  'test-core',
+  'test-core-with-expect',
   'test-ip4-config',
   'test-ip6-config',
   'test-dcb',
@@ -18,7 +18,7 @@ foreach test_unit: test_units
   )
 
   test(
-    'src/' + test_unit,
+    test_unit,
     test_script,
     args: test_args + [exe.full_path()],
     timeout: default_test_timeout,
@@ -34,7 +34,7 @@ cflags = [
 
 exe = executable(
   test_unit,
-  [test_unit + '.c'],
+  test_unit + '.c',
   include_directories: src_inc,
   dependencies: libnm_core_dep,
   c_args: cflags,
@@ -45,7 +45,7 @@ exe = executable(
 )
 
 test(
-  'src/' + test_unit,
+  test_unit,
   test_script,
   args: test_args + [exe.full_path()],
 )
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-core-with-expect.c
similarity index 100%
rename from src/tests/test-general-with-expect.c
rename to src/tests/test-core-with-expect.c
diff --git a/src/tests/test-general.c b/src/tests/test-core.c
similarity index 100%
rename from src/tests/test-general.c
rename to src/tests/test-core.c