diff --git a/tests/test-diff-subdir.out b/tests/test-diff-subdir.out
deleted file mode 100644
--- a/tests/test-diff-subdir.out
+++ /dev/null
@@ -1,23 +0,0 @@
-EVERYTHING
-diff -r ec612a6291f1 alpha/one
---- a/alpha/one
-+++ b/alpha/one
-@@ -0,0 +1,1 @@
-+1
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
-BETA ONLY
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
-INSIDE BETA
-diff -r ec612a6291f1 beta/two
---- a/beta/two
-+++ b/beta/two
-@@ -0,0 +1,1 @@
-+2
diff --git a/tests/test-diff-subdir b/tests/test-diff-subdir.t
old mode 100755
new mode 100644
rename from tests/test-diff-subdir
rename to tests/test-diff-subdir.t
--- a/tests/test-diff-subdir
+++ b/tests/test-diff-subdir.t
@@ -1,24 +1,46 @@
-#!/bin/sh
+  $ hg init
 
-hg init
+  $ mkdir alpha
+  $ touch alpha/one
+  $ mkdir beta
+  $ touch beta/two
 
-mkdir alpha
-touch alpha/one
-mkdir beta
-touch beta/two
+  $ hg add alpha/one beta/two
+  $ hg ci -m "start"
 
-hg add alpha/one beta/two
-hg ci -m "start" -d "1000000 0"
+  $ echo 1 > alpha/one
+  $ echo 2 > beta/two
+
+everything
 
-echo 1 > alpha/one
-echo 2 > beta/two
+  $ hg diff --nodates
+  diff -r 7d5ef1aea329 alpha/one
+  --- a/alpha/one
+  +++ b/alpha/one
+  @@ -0,0 +1,1 @@
+  +1
+  diff -r 7d5ef1aea329 beta/two
+  --- a/beta/two
+  +++ b/beta/two
+  @@ -0,0 +1,1 @@
+  +2
 
-echo EVERYTHING
-hg diff --nodates
+beta only
 
-echo BETA ONLY
-hg diff --nodates beta
+  $ hg diff --nodates beta
+  diff -r 7d5ef1aea329 beta/two
+  --- a/beta/two
+  +++ b/beta/two
+  @@ -0,0 +1,1 @@
+  +2
+
+inside beta
 
-echo INSIDE BETA
-cd beta
-hg diff --nodates .
+  $ cd beta
+  $ hg diff --nodates .
+  diff -r 7d5ef1aea329 beta/two
+  --- a/beta/two
+  +++ b/beta/two
+  @@ -0,0 +1,1 @@
+  +2
+