diff --git a/tests/Makefile.am b/tests/Makefile.am
index d8262f07..56c4a067 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -4,10 +4,18 @@ AM_CFLAGS = $(WARN_CFLAGS)
 
 check_PROGRAMS = net-accept-connect set_ptracer_any sigaction
 
-TESTS = ptrace_setoptions strace-f qual_syscall sigaction.sh stat net \
-	detach-sleeping detach-stopped detach-running
+TESTS = \
+	ptrace_setoptions.test \
+	strace-f.test \
+	qual_syscall.test \
+	sigaction.test \
+	stat.test \
+	net.test \
+	detach-sleeping.test \
+	detach-stopped.test \
+	detach-running.test
 
-LOG_COMPILER = $(srcdir)/run.sh
+TEST_LOG_COMPILER = $(srcdir)/run.sh
 
 EXTRA_DIST = init.sh run.sh sigaction.awk $(TESTS)
 
diff --git a/tests/detach-running b/tests/detach-running.test
similarity index 100%
rename from tests/detach-running
rename to tests/detach-running.test
diff --git a/tests/detach-sleeping b/tests/detach-sleeping.test
similarity index 100%
rename from tests/detach-sleeping
rename to tests/detach-sleeping.test
diff --git a/tests/detach-stopped b/tests/detach-stopped.test
similarity index 100%
rename from tests/detach-stopped
rename to tests/detach-stopped.test
diff --git a/tests/net b/tests/net.test
similarity index 100%
rename from tests/net
rename to tests/net.test
diff --git a/tests/ptrace_setoptions b/tests/ptrace_setoptions.test
similarity index 100%
rename from tests/ptrace_setoptions
rename to tests/ptrace_setoptions.test
diff --git a/tests/qual_syscall b/tests/qual_syscall.test
similarity index 100%
rename from tests/qual_syscall
rename to tests/qual_syscall.test
diff --git a/tests/sigaction.sh b/tests/sigaction.test
similarity index 100%
rename from tests/sigaction.sh
rename to tests/sigaction.test
diff --git a/tests/stat b/tests/stat.test
similarity index 100%
rename from tests/stat
rename to tests/stat.test
diff --git a/tests/strace-f b/tests/strace-f.test
similarity index 100%
rename from tests/strace-f
rename to tests/strace-f.test