diff --git a/configure.ac b/configure.ac
index ddc59fd5..74aa1012 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,9 +60,7 @@ PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.38 libdrm])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
 # for dma-buf tests
-PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33], nouveau=yes, nouveau=no)
-
-AM_CONDITIONAL(BUILD_NOUVEAU, [test "x$nouveau" != xno])
+PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm_nouveau >= 2.4.33])
 
 # for testdisplay
 PKG_CHECK_MODULES(CAIRO, cairo)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 282d55c5..9f8c7984 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -71,17 +71,11 @@ TESTS_progs = \
 	gem_ctx_bad_exec \
 	gem_ctx_basic \
 	gem_reg_read \
-	prime_self_import \
-	$(NULL)
-
-if BUILD_NOUVEAU
-TESTS_progs += \
 	prime_nv_api  \
 	prime_nv_pcopy \
 	prime_nv_test \
+	prime_self_import \
 	$(NULL)
-endif
-
 
 # IMPORTANT: The ZZ_ tests need to be run last!
 # ... and make can't deal with inlined comments ...