diff --git a/test.sh b/test.sh
deleted file mode 100755
index daf142c..0000000
--- a/test.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -eu
-cd "$(dirname "$0")"
-echo "Entering directory '$PWD'"
-payload="trivial-tar-writer.scm test.sh"
-set -x
-chibi-scheme -A . test-r7rs.scm $payload >test-chibi.tar
-gsi-script . test-r7rs.scm $payload >test-gambit.tar
-gosh -A . test-r7rs.scm $payload >test-gauche.tar
-kawa -Dkawa.import.path="$PWD/*.sld" test-r7rs.scm $payload >test-kawa.tar
-bsdtar -cf test-bsd.tar $payload
-gtar -cf test-gnu.tar $payload
-hexdump -C test-chibi.tar
-echo
-echo
-echo
-hexdump -C test-gnu.tar
-echo
-echo
-echo
-hexdump -C test-bsd.tar
diff --git a/test-tex-chibi.scm b/tex-parser-test.scm
similarity index 100%
rename from test-tex-chibi.scm
rename to tex-parser-test.scm
diff --git a/test-r7rs.scm b/trivial-tar-writer-test.scm
similarity index 100%
rename from test-r7rs.scm
rename to trivial-tar-writer-test.scm
diff --git a/trivial-tar-writer-test.sh b/trivial-tar-writer-test.sh
new file mode 100755
index 0000000..b4c4156
--- /dev/null
+++ b/trivial-tar-writer-test.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -eu
+cd "$(dirname "$0")"
+echo "Entering directory '$PWD'"
+payload="trivial-tar-writer.scm trivial-tar-writer-test.sh"
+set -x
+chibi-scheme -A . trivial-tar-writer-test.scm $payload \
+    >trivial-tar-writer-test-chibi.tar
+gsi-script . trivial-tar-writer-test.scm $payload \
+    >trivial-tar-writer-test-gambit.tar
+gosh -A . trivial-tar-writer-test.scm $payload \
+    >trivial-tar-writer-test-gauche.tar
+kawa -Dkawa.import.path="$PWD/*.sld" trivial-tar-writer-test.scm $payload \
+    >trivial-tar-writer-test-kawa.tar
+bsdtar -cf trivial-tar-writer-test-bsd.tar $payload
+gtar -cf trivial-tar-writer-test-gnu.tar $payload
+hexdump -C trivial-tar-writer-test-chibi.tar
+echo
+echo
+echo
+hexdump -C trivial-tar-writer-test-gnu.tar
+echo
+echo
+echo
+hexdump -C trivial-tar-writer-test-bsd.tar