diff --git a/Makefile.am b/Makefile.am
index 6ff0165b6..ae7bddd14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2794,6 +2794,44 @@ EXTRA_DIST += \
 	src/supplicant-manager/tests/certs/test-ca-cert.pem \
 	src/supplicant-manager/tests/certs/test-cert.p12
 
+###############################################################################
+# src/tests/config
+###############################################################################
+
+check_programs += src/tests/config/test-config
+
+src_tests_config_test_config_SOURCES = \
+	src/tests/config/nm-test-device.c \
+	src/tests/config/nm-test-device.h \
+	src/tests/config/test-config.c
+
+src_tests_config_test_config_CPPFLAGS = \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/devices \
+	-I${top_srcdir}/src/platform \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GLIB_CFLAGS) \
+	-DSRCDIR=\""$(abs_srcdir)/src/tests/config"\" \
+	-DBUILDDIR=\""$(abs_builddir)/src/tests/config"\"
+
+src_tests_config_test_config_LDADD = \
+	src/libNetworkManagerTest.la
+
+EXTRA_DIST += \
+	src/tests/config/NetworkManager.conf \
+	src/tests/config/NetworkManager.state \
+	src/tests/config/bad.conf \
+	src/tests/config/global-dns-invalid.conf \
+	src/tests/config/conf.d/00-overrides.conf \
+	src/tests/config/conf.d/10-more.conf \
+	src/tests/config/conf.d/20-config-enable-1.conf \
+	src/tests/config/conf.d/90-last.conf
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/configure.ac b/configure.ac
index 3fd2d94b7..7cf36dd97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1136,7 +1136,6 @@ Makefile
 shared/nm-version-macros.h
 src/Makefile
 src/tests/Makefile
-src/tests/config/Makefile
 libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index fc22658d9..293b8a2c7 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = config
-
 @GNOME_CODE_COVERAGE_RULES@
 
 AM_CPPFLAGS = \
diff --git a/src/tests/config/Makefile.am b/src/tests/config/Makefile.am
deleted file mode 100644
index 2b3ce90ad..000000000
--- a/src/tests/config/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/devices \
-	-I${top_srcdir}/src/platform \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS) \
-	-DSRCDIR=\""$(abs_srcdir)"\" \
-	-DBUILDDIR=\""$(abs_builddir)"\"
-
-noinst_PROGRAMS = \
-	test-config
-
-test_config_SOURCES = \
-	nm-test-device.c \
-	nm-test-device.h \
-	test-config.c
-
-test_config_LDADD = \
-	$(top_builddir)/src/libNetworkManagerTest.la
-
-@NM_LOG_COMPILER@
-TESTS = test-config
-
-EXTRA_DIST = \
-	NetworkManager.conf \
-	NetworkManager.state \
-	bad.conf \
-	global-dns-invalid.conf \
-	conf.d/00-overrides.conf \
-	conf.d/10-more.conf \
-	conf.d/20-config-enable-1.conf \
-	conf.d/90-last.conf