2 files changed, 4 insertions, 11 deletions
diff --git a/src/settings/plugins/keyfile/tests/meson.build b/src/settings/plugins/keyfile/tests/meson.build
index 54b4ee0d..33aaa264 100644
--- a/src/settings/plugins/keyfile/tests/meson.build
+++ b/src/settings/plugins/keyfile/tests/meson.build
@@ -2,16 +2,11 @@ test_unit = 'test-keyfile'
 
 test_keyfiles_dir = join_paths(meson.current_source_dir(), 'keyfiles')
 
-cflags = [
-  '-DTEST_KEYFILES_DIR="@0@"'.format(test_keyfiles_dir),
-  '-DTEST_SCRATCH_DIR="@0@"'.format(test_keyfiles_dir)
-]
-
 exe = executable(
   test_unit,
   test_unit + '.c',
   dependencies: test_nm_dep,
-  c_args: cflags
+  c_args: nm_build_cflags,
 )
 
 test(
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index b46475e8..a3045f7d 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -37,6 +37,9 @@
 
 #include "nm-test-utils-core.h"
 
+#define TEST_KEYFILES_DIR       NM_BUILD_SRCDIR"/src/settings/plugins/keyfile/tests/keyfiles"
+#define TEST_SCRATCH_DIR        NM_BUILD_BUILDDIR"/src/settings/plugins/keyfile/tests/keyfiles"
+
 /*****************************************************************************/
 
 static void
@@ -400,7 +403,6 @@ add_one_ip_route (NMSettingIPConfig *s_ip,
 	nm_ip_route_unref (route);
 }
 
-
 static void
 test_write_wired_connection (void)
 {
@@ -2415,7 +2417,6 @@ test_read_minimal (void)
 	                                                 &s_con);
 	nmtst_connection_normalize (con_archetype);
 
-
 	connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_1");
 	g_object_set (s_con,
 	              NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection),
@@ -2424,7 +2425,6 @@ test_read_minimal (void)
 	nmtst_assert_connection_equals (con_archetype, FALSE, connection, FALSE);
 	g_clear_object (&connection);
 
-
 	connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_2");
 	g_object_set (s_con,
 	              NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection),
@@ -2451,7 +2451,6 @@ test_read_minimal_slave (void)
 	              NULL);
 	nmtst_connection_normalize (con_archetype);
 
-
 	connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_slave_1");
 	g_object_set (s_con,
 	              NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection),
@@ -2460,7 +2459,6 @@ test_read_minimal_slave (void)
 	nmtst_assert_connection_equals (con_archetype, FALSE, connection, FALSE);
 	g_clear_object (&connection);
 
-
 	connection = keyfile_read_connection_from_file (TEST_KEYFILES_DIR"/Test_minimal_slave_2");
 	g_object_set (s_con,
 	              NM_SETTING_CONNECTION_ID, nm_connection_get_id (connection),