diff --git a/tests/actofgod-test b/tests/actofgod-test
index e2184bdd..f5d3e8e4 100755
--- a/tests/actofgod-test
+++ b/tests/actofgod-test
@@ -16,7 +16,7 @@ WORLD_Y 16
 GODNEWS 1
 EOF
 
-begin_test "$srcdir"/tests/actofgod/init_script
+begin_test "$srcdir"/tests/actofgod/setup-POGO
 
 perl "$srcdir"/tests/actofgod/geninput.pl | feed_input POGO peter
 
diff --git a/tests/actofgod/init_script b/tests/actofgod/setup-POGO
similarity index 100%
rename from tests/actofgod/init_script
rename to tests/actofgod/setup-POGO
diff --git a/tests/fire-test b/tests/fire-test
index d2f9bb1d..4a76b697 100755
--- a/tests/fire-test
+++ b/tests/fire-test
@@ -16,7 +16,7 @@ WORLD_Y 16
 EASY_BRIDGES 1
 EOF
 
-begin_test "$srcdir"/tests/fire/init_script
+begin_test "$srcdir"/tests/fire/setup-POGO
 feed_dir "$srcdir"/tests/fire
 end_test
 
diff --git a/tests/fire/init_script b/tests/fire/setup-POGO
similarity index 100%
rename from tests/fire/init_script
rename to tests/fire/setup-POGO
diff --git a/tests/test-common.sh b/tests/test-common.sh
index 35352195..a2e22cc0 100644
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -135,12 +135,15 @@ begin_test()
     then
 	cp -r sandbox/var/empire/tel sandbox/var/empire/empty.tel
 	start_server
-	feed_input POGO peter "$@"
+	if [ "$#" -eq 0 ]
+	then feed_input POGO peter
+	else feed_files "$@"
+	fi
 	stop_server
-	mv sandbox/var/empire/tel sandbox/var/empire/init.tel
+	mv sandbox/var/empire/tel sandbox/var/empire/setup.tel
 	mv sandbox/var/empire/empty.tel sandbox/var/empire/tel
-	mv sandbox/var/empire/journal.log sandbox/var/empire/init.journal.log
-	mv sandbox/var/empire/server.log sandbox/var/empire/init.server.log
+	mv sandbox/var/empire/journal.log sandbox/var/empire/setup.journal.log
+	mv sandbox/var/empire/server.log sandbox/var/empire/setup.server.log
     fi
     start_server
 }