diff --git a/Makefile.am b/Makefile.am
index f757b4951d..61ff641af9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,14 +75,7 @@ SUBDIRS = \
 	. \
 	po \
 	man \
-	examples
-
-if WITH_LEGACY_LIBRARIES
-SUBDIRS += \
-	libnm-glib
-endif
-
-SUBDIRS += \
+	examples \
 	docs \
 	vapi
 
@@ -3950,6 +3943,51 @@ check-local-exports-libnm-glib:
 
 check_local += check-local-exports-libnm-glib
 
+###############################################################################
+# libnm-glib/tests
+###############################################################################
+
+libnm_glib_tests_cppflags = \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/libnm-util \
+	-I$(top_srcdir)/libnm-glib \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
+	-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
+	$(GLIB_CFLAGS) \
+	$(DBUS_CFLAGS)
+
+check_programs += \
+	libnm-glib/tests/test-nm-client \
+	libnm-glib/tests/test-remote-settings-client
+
+libnm_glib_tests_test_nm_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
+
+libnm_glib_tests_test_nm_client_SOURCES = \
+	shared/nm-test-utils-impl.c \
+	shared/nm-test-libnm-utils.h \
+	libnm-glib/tests/test-nm-client.c
+
+libnm_glib_tests_test_nm_client_LDADD = \
+	libnm-util/libnm-util.la \
+	libnm-glib/libnm-glib.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
+libnm_glib_tests_test_remote_settings_client_CPPFLAGS = $(libnm_glib_tests_cppflags)
+
+libnm_glib_tests_test_remote_settings_client_SOURCES = \
+	shared/nm-test-utils-impl.c \
+	shared/nm-test-libnm-utils.h \
+	libnm-glib/tests/test-remote-settings-client.c
+
+libnm_glib_tests_test_remote_settings_client_LDADD = \
+	libnm-util/libnm-util.la \
+	libnm-glib/libnm-glib.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
+
 endif
 
 ###############################################################################
diff --git a/configure.ac b/configure.ac
index a9e4b224d1..566b6745b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1138,8 +1138,6 @@ libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-glib/libnm-glib.pc
 libnm-glib/libnm-glib-vpn.pc
-libnm-glib/Makefile
-libnm-glib/tests/Makefile
 man/Makefile
 man/common.ent
 po/Makefile.in
diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am
deleted file mode 100644
index 3c6155b9c6..0000000000
--- a/libnm-glib/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = tests
diff --git a/libnm-glib/tests/Makefile.am b/libnm-glib/tests/Makefile.am
deleted file mode 100644
index 09f34d1847..0000000000
--- a/libnm-glib/tests/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-if ENABLE_TESTS
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_srcdir)/libnm-util \
-	-I$(top_builddir)/libnm-util \
-	-I$(top_srcdir)/libnm-glib \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY \
-	-DTEST_NM_SERVICE=\"$(abs_top_srcdir)/tools/test-networkmanager-service.py\" \
-	$(GLIB_CFLAGS) \
-	$(DBUS_CFLAGS)
-
-noinst_PROGRAMS = $(TESTS)
-
-@NM_LOG_COMPILER@
-TESTS = test-nm-client test-remote-settings-client
-
-####### NMClient and non-settings tests #######
-
-test_nm_client_SOURCES = \
-	$(top_builddir)/shared/nm-test-utils-impl.c \
-	$(top_builddir)/shared/nm-test-libnm-utils.h \
-	test-nm-client.c
-
-test_nm_client_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-####### remote settings client test #######
-
-test_remote_settings_client_SOURCES = \
-	$(top_builddir)/shared/nm-test-utils-impl.c \
-	$(top_builddir)/shared/nm-test-libnm-utils.h \
-	test-remote-settings-client.c
-
-test_remote_settings_client_LDADD = \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm-glib.la \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS)
-
-###########################################
-
-endif