diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 3042b19794..72863bc4a6 100644
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -4,9 +4,7 @@ include $(top_srcdir)/nm.mk
 
 @GNOME_CODE_COVERAGE_RULES@
 
-if ENABLE_TESTS
 SUBDIRS=. tests
-endif
 
 AM_CPPFLAGS = \
 	-I${top_srcdir}/src \
diff --git a/src/devices/wifi/tests/Makefile.am b/src/devices/wifi/tests/Makefile.am
index 4ad66261b2..1f0171d0db 100644
--- a/src/devices/wifi/tests/Makefile.am
+++ b/src/devices/wifi/tests/Makefile.am
@@ -1,3 +1,5 @@
+if ENABLE_TESTS
+
 AM_CPPFLAGS = \
 	-I$(top_builddir)/introspection \
 	-I$(top_srcdir)/shared \
@@ -26,3 +28,4 @@ test_general_LDADD = $(top_builddir)/src/libNetworkManager.la
 @VALGRIND_RULES@
 TESTS = test-general
 
+endif