diff --git a/Makefile.am b/Makefile.am
index ccd08234..4a8ad0cd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = daemon data help lib po src tools tests
 
-EXTRA_DIST = AUTHORS
+EXTRA_DIST = AUTHORS tap-test
 
 DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir='$(prefix)/etc/systemd/system'
 
diff --git a/build-aux/tap-test b/tap-test
similarity index 100%
rename from build-aux/tap-test
rename to tap-test
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c37727a4..ec5b6466 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,7 +29,7 @@ TEST_ENVIRONMENT = \
 	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 TEST_PROGS = test-model-filter
-LOG_COMPILER = $(top_srcdir)/build-aux/tap-test
+LOG_COMPILER = $(top_srcdir)/tap-test
 
 noinst_PROGRAMS = $(TESTS)
 check_PROGRAMS = $(TESTS)