diff --git a/configure.ac b/configure.ac
index e66876c5..d66c9f95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,6 @@ AC_ARG_ENABLE(tests,
 	      [BUILD_TESTS=$enableval], [BUILD_TESTS="yes"])
 if test "x$BUILD_TESTS" = xyes; then
 	AC_DEFINE(BUILD_TESTS, 1, [Build tests])
-	AC_CONFIG_FILES([tests/Makefile])
 fi
 AM_CONDITIONAL(BUILD_TESTS, [test "x$BUILD_TESTS" = xyes])
 
@@ -139,6 +138,7 @@ AC_CONFIG_FILES([
 		 lib/Makefile
 		 man/Makefile
 		 scripts/Makefile
+		 tests/Makefile
 		 tools/Makefile
 		 debugger/Makefile
 		 debugger/system_routine/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 20b73244..ef68a022 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,3 +1,4 @@
+if BUILD_TESTS
 noinst_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
@@ -195,3 +196,4 @@ prime_nv_api_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_api_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
 prime_nv_pcopy_CFLAGS = $(AM_CFLAGS) $(DRM_NOUVEAU_CFLAGS)
 prime_nv_pcopy_LDADD = $(LDADD) $(DRM_NOUVEAU_LIBS)
+endif