diff --git a/Makefile.am b/Makefile.am
index b8b15f4..2a01464 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,9 +20,7 @@
 
 SUBDIRS = include/epoxy src
 
-if HAVE_X11
 SUBDIRS += test
-endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = epoxy.pc
diff --git a/configure.ac b/configure.ac
index 5255c7a..a9fc38b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,12 @@ case $host_os in
         # resolved at link time, so we have to link directly aginst
         # opengl32.dll.  But that's the only GL provider, anyway.
         EPOXY_LINK_LIBS="-lopengl32"
+
+        # Testing our built windows binaries requires that they be run
+        # under wine.  Yeah, we should be nice and autodetect, but
+        # there's lots of missing autodetection for the testsuite
+        # (like checking for EGL and GLX libs in non-windows.).
+        AC_SUBST([LOG_COMPILER], [wine])
         ;;
     *)
         build_egl=yes
diff --git a/test/Makefile.am b/test/Makefile.am
index 6e53a5d..b23ba49 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -43,8 +43,8 @@ AM_CPPFLAGS = \
 TESTS = \
 	$(EGL_TESTS) \
 	$(GLX_TESTS) \
-	headerguards \
-	miscdefines \
+	headerguards$(EXEEXT) \
+	miscdefines$(EXEEXT) \
 	$()
 
 check_PROGRAMS = $(TESTS)