diff --git a/tests/fire-test b/tests/fire-test
index e4de869a..dfee3627 100755
--- a/tests/fire-test
+++ b/tests/fire-test
@@ -18,14 +18,7 @@ GODNEWS 0
 EOF
 
 begin_test "$srcdir"/tests/fire/init_script
-
-for i in `git ls-files "$srcdir"/tests/fire | grep '/[0-9][0-9]-.*$'`
-do
-    c="${i##*/??-}"
-    r=`echo $c | sed 's/^POGO$/peter/'`
-    feed_input "$c" "$r" "$i"
-done
-
+feed_dir "$srcdir"/tests/fire
 end_test
 
 cmp_out var/empire/server.log var/empire/journal.log fire.xdump
diff --git a/tests/smoke-test b/tests/smoke-test
index acde5219..d8f3f96a 100755
--- a/tests/smoke-test
+++ b/tests/smoke-test
@@ -14,30 +14,7 @@ create_sandbox
 begin_test "$srcdir"/tests/smoke/fairland.xdump
 
 feed_input POGO peter "$srcdir"/tests/smoke/newcap_script
-
-t=
-for i in `git ls-files "$srcdir"/tests/smoke | grep 'tests/smoke/../..$'`
-do
-    p="$t"
-    t="${i%/??}"
-    if [ "$p" != "$t" ] && [ "$p" ]
-    then
-	feed_input POGO peter <<EOF
-power new
-report *
-cen * ?own#0
-comm * ?own#0
-reso * ?own#0
-force
-EOF
-    fi
-    b="${i##*/}"
-    if [ $b -eq 0 ]
-    then c=POGO r=peter
-    else c="${b#0}"; r="$c"
-    fi
-    feed_input "$c" "$r" "$i"
-done
+feed_dir "$srcdir"/tests/smoke
 
 end_test
 
diff --git a/tests/smoke/00/00 b/tests/smoke/00/00-POGO
similarity index 100%
rename from tests/smoke/00/00
rename to tests/smoke/00/00-POGO
diff --git a/tests/smoke/00/01 b/tests/smoke/00/01-1
similarity index 100%
rename from tests/smoke/00/01
rename to tests/smoke/00/01-1
diff --git a/tests/smoke/00/02 b/tests/smoke/00/02-2
similarity index 100%
rename from tests/smoke/00/02
rename to tests/smoke/00/02-2
diff --git a/tests/smoke/00/03 b/tests/smoke/00/03-3
similarity index 100%
rename from tests/smoke/00/03
rename to tests/smoke/00/03-3
diff --git a/tests/smoke/00/04 b/tests/smoke/00/04-4
similarity index 100%
rename from tests/smoke/00/04
rename to tests/smoke/00/04-4
diff --git a/tests/smoke/00/05 b/tests/smoke/00/05-5
similarity index 100%
rename from tests/smoke/00/05
rename to tests/smoke/00/05-5
diff --git a/tests/smoke/00/06 b/tests/smoke/00/06-6
similarity index 100%
rename from tests/smoke/00/06
rename to tests/smoke/00/06-6
diff --git a/tests/smoke/00/07 b/tests/smoke/00/07-7
similarity index 100%
rename from tests/smoke/00/07
rename to tests/smoke/00/07-7
diff --git a/tests/smoke/00/08 b/tests/smoke/00/08-8
similarity index 100%
rename from tests/smoke/00/08
rename to tests/smoke/00/08-8
diff --git a/tests/smoke/00/09 b/tests/smoke/00/09-9
similarity index 100%
rename from tests/smoke/00/09
rename to tests/smoke/00/09-9
diff --git a/tests/smoke/00/10 b/tests/smoke/00/10-10
similarity index 100%
rename from tests/smoke/00/10
rename to tests/smoke/00/10-10
diff --git a/tests/smoke/00/99-POGO b/tests/smoke/00/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/00/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/01/01 b/tests/smoke/01/01-1
similarity index 100%
rename from tests/smoke/01/01
rename to tests/smoke/01/01-1
diff --git a/tests/smoke/01/99-POGO b/tests/smoke/01/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/01/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/02/01 b/tests/smoke/02/01-1
similarity index 100%
rename from tests/smoke/02/01
rename to tests/smoke/02/01-1
diff --git a/tests/smoke/02/99-POGO b/tests/smoke/02/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/02/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/03/01 b/tests/smoke/03/01-1
similarity index 100%
rename from tests/smoke/03/01
rename to tests/smoke/03/01-1
diff --git a/tests/smoke/03/08 b/tests/smoke/03/08-8
similarity index 100%
rename from tests/smoke/03/08
rename to tests/smoke/03/08-8
diff --git a/tests/smoke/03/99-POGO b/tests/smoke/03/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/03/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/04/01 b/tests/smoke/04/01-1
similarity index 100%
rename from tests/smoke/04/01
rename to tests/smoke/04/01-1
diff --git a/tests/smoke/04/08 b/tests/smoke/04/08-8
similarity index 100%
rename from tests/smoke/04/08
rename to tests/smoke/04/08-8
diff --git a/tests/smoke/04/99-POGO b/tests/smoke/04/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/04/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/05/01 b/tests/smoke/05/01-1
similarity index 100%
rename from tests/smoke/05/01
rename to tests/smoke/05/01-1
diff --git a/tests/smoke/05/99-POGO b/tests/smoke/05/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/05/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/06/01 b/tests/smoke/06/01-1
similarity index 100%
rename from tests/smoke/06/01
rename to tests/smoke/06/01-1
diff --git a/tests/smoke/06/08 b/tests/smoke/06/08-8
similarity index 100%
rename from tests/smoke/06/08
rename to tests/smoke/06/08-8
diff --git a/tests/smoke/06/99-POGO b/tests/smoke/06/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/06/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/07/01 b/tests/smoke/07/01-1
similarity index 100%
rename from tests/smoke/07/01
rename to tests/smoke/07/01-1
diff --git a/tests/smoke/07/08 b/tests/smoke/07/08-8
similarity index 100%
rename from tests/smoke/07/08
rename to tests/smoke/07/08-8
diff --git a/tests/smoke/07/99-POGO b/tests/smoke/07/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/07/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/08/01 b/tests/smoke/08/01-1
similarity index 100%
rename from tests/smoke/08/01
rename to tests/smoke/08/01-1
diff --git a/tests/smoke/08/08 b/tests/smoke/08/08-8
similarity index 100%
rename from tests/smoke/08/08
rename to tests/smoke/08/08-8
diff --git a/tests/smoke/08/99-POGO b/tests/smoke/08/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/08/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/09/01 b/tests/smoke/09/01-1
similarity index 100%
rename from tests/smoke/09/01
rename to tests/smoke/09/01-1
diff --git a/tests/smoke/09/08 b/tests/smoke/09/08-8
similarity index 100%
rename from tests/smoke/09/08
rename to tests/smoke/09/08-8
diff --git a/tests/smoke/09/99-POGO b/tests/smoke/09/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/09/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/10/01 b/tests/smoke/10/01-1
similarity index 100%
rename from tests/smoke/10/01
rename to tests/smoke/10/01-1
diff --git a/tests/smoke/10/08 b/tests/smoke/10/08-8
similarity index 100%
rename from tests/smoke/10/08
rename to tests/smoke/10/08-8
diff --git a/tests/smoke/10/99-POGO b/tests/smoke/10/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/10/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/11/01 b/tests/smoke/11/01-1
similarity index 100%
rename from tests/smoke/11/01
rename to tests/smoke/11/01-1
diff --git a/tests/smoke/11/08 b/tests/smoke/11/08-8
similarity index 100%
rename from tests/smoke/11/08
rename to tests/smoke/11/08-8
diff --git a/tests/smoke/11/99-POGO b/tests/smoke/11/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/11/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/12/01 b/tests/smoke/12/01-1
similarity index 100%
rename from tests/smoke/12/01
rename to tests/smoke/12/01-1
diff --git a/tests/smoke/12/08 b/tests/smoke/12/08-8
similarity index 100%
rename from tests/smoke/12/08
rename to tests/smoke/12/08-8
diff --git a/tests/smoke/12/99-POGO b/tests/smoke/12/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/12/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/13/01 b/tests/smoke/13/01-1
similarity index 100%
rename from tests/smoke/13/01
rename to tests/smoke/13/01-1
diff --git a/tests/smoke/13/02 b/tests/smoke/13/02-2
similarity index 100%
rename from tests/smoke/13/02
rename to tests/smoke/13/02-2
diff --git a/tests/smoke/13/08 b/tests/smoke/13/08-8
similarity index 100%
rename from tests/smoke/13/08
rename to tests/smoke/13/08-8
diff --git a/tests/smoke/13/99-POGO b/tests/smoke/13/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/13/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/14/01 b/tests/smoke/14/01-1
similarity index 100%
rename from tests/smoke/14/01
rename to tests/smoke/14/01-1
diff --git a/tests/smoke/14/02 b/tests/smoke/14/02-2
similarity index 100%
rename from tests/smoke/14/02
rename to tests/smoke/14/02-2
diff --git a/tests/smoke/14/08 b/tests/smoke/14/08-8
similarity index 100%
rename from tests/smoke/14/08
rename to tests/smoke/14/08-8
diff --git a/tests/smoke/14/99-POGO b/tests/smoke/14/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/14/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/15/01 b/tests/smoke/15/01-1
similarity index 100%
rename from tests/smoke/15/01
rename to tests/smoke/15/01-1
diff --git a/tests/smoke/15/02 b/tests/smoke/15/02-2
similarity index 100%
rename from tests/smoke/15/02
rename to tests/smoke/15/02-2
diff --git a/tests/smoke/15/08 b/tests/smoke/15/08-8
similarity index 100%
rename from tests/smoke/15/08
rename to tests/smoke/15/08-8
diff --git a/tests/smoke/15/99-POGO b/tests/smoke/15/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/15/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/16/01 b/tests/smoke/16/01-1
similarity index 100%
rename from tests/smoke/16/01
rename to tests/smoke/16/01-1
diff --git a/tests/smoke/16/02 b/tests/smoke/16/02-2
similarity index 100%
rename from tests/smoke/16/02
rename to tests/smoke/16/02-2
diff --git a/tests/smoke/16/08 b/tests/smoke/16/08-8
similarity index 100%
rename from tests/smoke/16/08
rename to tests/smoke/16/08-8
diff --git a/tests/smoke/16/99-POGO b/tests/smoke/16/99-POGO
new file mode 100644
index 00000000..c3feb36e
--- /dev/null
+++ b/tests/smoke/16/99-POGO
@@ -0,0 +1,6 @@
+power new
+report *
+cen * ?own#0
+comm * ?own#0
+reso * ?own#0
+force
diff --git a/tests/smoke/99/00 b/tests/smoke/99/00-POGO
similarity index 100%
rename from tests/smoke/99/00
rename to tests/smoke/99/00-POGO
diff --git a/tests/smoke/99/01 b/tests/smoke/99/01-1
similarity index 100%
rename from tests/smoke/99/01
rename to tests/smoke/99/01-1
diff --git a/tests/test-common.sh b/tests/test-common.sh
index 80645206..6f442b38 100644
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -104,6 +104,21 @@ feed_input()
     sed '/^|/d' "$@" | src/client/empire "$c" "$r" >/dev/null
 }
 
+feed_files()
+{
+    for i
+    do
+	c="${i##*/*-}"
+	r=`echo $c | sed 's/^POGO$/peter/'`
+	feed_input "$c" "$r" "$i"
+    done
+}
+
+feed_dir()
+{
+    feed_files `git ls-files "$@" | grep '/[0-9][0-9]-[^/]*$'`
+}
+
 begin_test()
 {
     src/util/files -e sandbox/etc/empire/econfig -f >/dev/null