diff --git a/tests/test-empty.out b/tests/test-empty.out
deleted file mode 100644
--- a/tests/test-empty.out
+++ /dev/null
@@ -1,21 +0,0 @@
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-0 files, 0 changesets, 0 total revisions
-00changelog.i
-requires
-store
-updating to branch default
-0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-checking changesets
-checking manifests
-crosschecking files in changesets and manifests
-checking files
-0 files, 0 changesets, 0 total revisions
-00changelog.i
-branch
-dirstate
-hgrc
-requires
-store
diff --git a/tests/test-empty b/tests/test-empty.t
old mode 100755
new mode 100644
rename from tests/test-empty
rename to tests/test-empty.t
--- a/tests/test-empty
+++ b/tests/test-empty.t
@@ -1,17 +1,52 @@
-#!/bin/sh
+Create an empty repo:
+
+  $ hg init a
+  $ cd a
+
+Try some commands:
+
+  $ hg log
+  $ hg grep wah
+  $ hg manifest
+  $ hg verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  0 files, 0 changesets, 0 total revisions
+
+Check the basic files created:
+
+  $ ls .hg
+  00changelog.i
+  requires
+  store
+
+Should be empty:
 
-hg init a
-cd a
-hg log
-hg grep wah
-hg manifest
-hg verify
-ls .hg
-ls .hg/store
+  $ ls .hg/store
+
+Poke at a clone:
 
-cd ..
-hg clone a b
-cd b
-hg verify
-ls .hg
-ls .hg/store
+  $ cd ..
+  $ hg clone a b
+  updating to branch default
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd b
+  $ hg verify
+  checking changesets
+  checking manifests
+  crosschecking files in changesets and manifests
+  checking files
+  0 files, 0 changesets, 0 total revisions
+  $ ls .hg
+  00changelog.i
+  branch
+  dirstate
+  hgrc
+  requires
+  store
+
+Should be empty:
+
+  $ ls .hg/store