diff --git a/Makefile.am b/Makefile.am
index bc11e2c..e9a2b95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,4 @@
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/build-aux/tap-test
+include $(top_srcdir)/build-aux/glib-tap.mk
 
 AM_CFLAGS = # CFLAGS applicable to all executables (products)
 
diff --git a/glib-tap.mk b/build-aux/glib-tap.mk
similarity index 97%
rename from glib-tap.mk
rename to build-aux/glib-tap.mk
index 016cb91..82f6862 100644
--- a/glib-tap.mk
+++ b/build-aux/glib-tap.mk
@@ -6,8 +6,8 @@ TESTS_ENVIRONMENT= \
 	G_DEBUG=gc-friendly 			\
 	MALLOC_CHECK_=2 			\
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/tap-driver.sh
-LOG_COMPILER = $(top_srcdir)/tap-test
+LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh
+LOG_COMPILER = $(top_srcdir)/build-aux/tap-test
 
 NULL =