diff --git a/configure.ac b/configure.ac
index f1d2b0f..fd390de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,8 @@ AC_SYS_LARGEFILE
 # uintptr_t to a void *") by default.  Kill that.
 XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion])
 
+has_znow=yes
+
 case $host_os in
     mingw*)
         build_egl=no
@@ -72,6 +74,7 @@ case $host_os in
         build_egl=no
         build_glx=yes
         build_wgl=no
+        has_znow=no
         EPOXY_LINK_LIBS=""
         ;;
     *)
@@ -101,6 +104,7 @@ if test x$build_wgl = xyes; then
     AC_DEFINE([BUILD_WGL], [1], [build WGL tests])
 fi
 
+AM_CONDITIONAL(HAS_ZNOW, test x$has_znow = xyes)
 
 case $host_os in
     mingw*)
diff --git a/test/Makefile.am b/test/Makefile.am
index 83cfa44..a478276 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -66,6 +66,10 @@ EGL_LIBS = libegl_common.la
 endif
 
 if BUILD_GLX
+if HAS_ZNOW
+GLX_SHARED_ZNOW = glx_shared_znow
+endif
+
 GLX_TESTS = \
 	glx_beginend \
 	glx_public_api \
@@ -73,7 +77,7 @@ GLX_TESTS = \
 	glx_glxgetprocaddress_nocontext \
 	glx_has_extension_nocontext \
 	glx_static \
-	glx_shared_znow \
+        $(GLX_SHARED_ZNOW) \
 	$()
 
 GLX_LIBS = libglx_common.la