diff --git a/test/include.am b/test/include.am
index 308813cd..eea249f8 100644
--- a/test/include.am
+++ b/test/include.am
@@ -42,14 +42,41 @@ noinst_HEADERS+=				\
 	test/tinytest_local.h			\
 	test/tinytest_macros.h
 
-# We need to copy this file, since automake doesn't want us to use top_srcdir
-# in TESTS.
-TESTS = test/test-script.sh
+TESTS = \
+	test_runner_epoll \
+	test_runner_select \
+	test_runner_kqueue \
+	test_runner_evport \
+	test_runner_devpoll \
+	test_runner_poll \
+	test_runner_win32 \
+	test_runner_timerfd \
+	test_runner_changelist \
+	test_runner_timerfd_changelist
+LOG_COMPILER = true
+TESTS_COMPILER = true
 
-test/test-script.sh: test/test.sh
-	cp $(top_srcdir)/test/test.sh $@
+test_runner_epoll: test/test.sh
+	test/test.sh -b EPOLL
+test_runner_select: test/test.sh
+	test/test.sh -b SELECT
+test_runner_kqueue: test/test.sh
+	test/test.sh -b KQUEUE
+test_runner_evport: test/test.sh
+	test/test.sh -b EVPORT
+test_runner_devpoll: test/test.sh
+	test/test.sh -b DEVPOLL
+test_runner_poll: test/test.sh
+	test/test.sh -b POLL
+test_runner_win32: test/test.sh
+	test/test.sh -b WIN32
+test_runner_timerfd: test/test.sh
+	test/test.sh -b "" -t
+test_runner_changelist: test/test.sh
+	test/test.sh -b "" -c
+test_runner_timerfd_changelist: test/test.sh
+	test/test.sh -b "" -T
 
-DISTCLEANFILES += test/test-script.sh
 DISTCLEANFILES += test/regress.gen.c test/regress.gen.h
 
 if BUILD_REGRESS