diff --git a/Makefile.am b/Makefile.am
index 282f6c7071..8e06ddf2e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2556,6 +2556,28 @@ check_local += check-local-devices-team
 
 endif
 
+###############################################################################
+# src/dnsmasq-manager/tests
+###############################################################################
+
+check_programs += src/dnsmasq-manager/tests/test-dnsmasq-utils
+
+src_dnsmasq_manager_tests_test_dnsmasq_utils_CPPFLAGS = \
+	-I$(top_srcdir)/shared \
+	-I${top_builddir}/shared \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I$(top_srcdir)/src/dnsmasq-manager \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/platform \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	$(GLIB_CFLAGS) \
+	-DTESTDIR="\"$(abs_srcdir)\""
+
+src_dnsmasq_manager_tests_test_dnsmasq_utils_LDADD = \
+	src/libNetworkManager.la
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/configure.ac b/configure.ac
index 742ca1df62..3274d112ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1137,7 +1137,6 @@ shared/nm-version-macros.h
 src/Makefile
 src/tests/Makefile
 src/tests/config/Makefile
-src/dnsmasq-manager/tests/Makefile
 src/supplicant-manager/tests/Makefile
 src/supplicant-manager/tests/certs/Makefile
 src/platform/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 099ac5fb34..81e0177510 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ SUBDIRS =
 
 if ENABLE_TESTS
 SUBDIRS += \
-	dnsmasq-manager/tests \
 	platform \
 	devices \
 	rdisc \
diff --git a/src/dnsmasq-manager/tests/Makefile.am b/src/dnsmasq-manager/tests/Makefile.am
deleted file mode 100644
index 3c4a895434..0000000000
--- a/src/dnsmasq-manager/tests/Makefile.am
+++ /dev/null
@@ -1,24 +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/dnsmasq-manager \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/platform \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS) \
-	-DTESTDIR="\"$(abs_srcdir)\""
-
-noinst_PROGRAMS = test-dnsmasq-utils
-
-test_dnsmasq_utils_SOURCES = \
-	test-dnsmasq-utils.c
-
-test_dnsmasq_utils_LDADD = \
-	$(top_builddir)/src/libNetworkManager.la
-
-@NM_LOG_COMPILER@
-TESTS = test-dnsmasq-utils
-