diff --git a/Makefile.am b/Makefile.am
index cd374ebdc..6ff0165b6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2769,6 +2769,31 @@ src_rdisc_tests_test_rdisc_fake_CPPFLAGS = $(src_rdisc_tests_cppflags)
 src_rdisc_tests_test_rdisc_fake_LDFLAGS = $(src_rdisc_tests_flags)
 src_rdisc_tests_test_rdisc_fake_LDADD = $(src_rdisc_tests_ldadd)
 
+###############################################################################
+# src/supplicant-manager/tests
+###############################################################################
+
+check_programs += src/supplicant-manager/tests/test-supplicant-config
+
+src_supplicant_manager_tests_test_supplicant_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/supplicant-manager \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	-DTEST_CERT_DIR=\"$(abs_srcdir)/src/supplicant-manager/tests/certs\" \
+	$(GLIB_CFLAGS)
+
+src_supplicant_manager_tests_test_supplicant_config_LDADD = \
+	src/libNetworkManager.la
+
+EXTRA_DIST += \
+	src/supplicant-manager/tests/certs/test-ca-cert.pem \
+	src/supplicant-manager/tests/certs/test-cert.p12
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/configure.ac b/configure.ac
index 6f518d9aa..3fd2d94b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,8 +1137,6 @@ shared/nm-version-macros.h
 src/Makefile
 src/tests/Makefile
 src/tests/config/Makefile
-src/supplicant-manager/tests/Makefile
-src/supplicant-manager/tests/certs/Makefile
 libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 7a8cfe45b..190260c5c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,5 @@ SUBDIRS =
 
 if ENABLE_TESTS
 SUBDIRS += \
-	supplicant-manager/tests \
 	tests
 endif
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
deleted file mode 100644
index 652b935f0..000000000
--- a/src/supplicant-manager/tests/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-SUBDIRS=certs
-
-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/supplicant-manager \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	-DTEST_CERT_DIR=\"$(abs_srcdir)/certs\" \
-	$(GLIB_CFLAGS)
-
-noinst_PROGRAMS = test-supplicant-config
-
-test_supplicant_config_SOURCES = \
-	test-supplicant-config.c
-
-test_supplicant_config_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la
-
-@NM_LOG_COMPILER@
-TESTS = test-supplicant-config
diff --git a/src/supplicant-manager/tests/certs/Makefile.am b/src/supplicant-manager/tests/certs/Makefile.am
deleted file mode 100644
index f2e889f7c..000000000
--- a/src/supplicant-manager/tests/certs/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-CERTS = \
-	test-ca-cert.pem \
-	test-cert.p12
-
-EXTRA_DIST = $(CERTS)
-