diff --git a/tests/test-mq-qrefresh-replace-log-message.out b/tests/test-mq-qrefresh-replace-log-message.out
deleted file mode 100644
--- a/tests/test-mq-qrefresh-replace-log-message.out
+++ /dev/null
@@ -1,33 +0,0 @@
-=======================
-Should fail if no patches applied
-no patches applied
-no patches applied
-=======================
-Should display 'First commit message'
-description:
-First commit message
-
-
-
-=======================
-Should display 'Second commit message'
-description:
-Second commit message
-
-
-
-=======================
-Should display 'Third commit message\n This is the 3rd log message'
-description:
-Third commit message
- This is the 3rd log message
-
-
-
-=======================
-Should display 'Fifth commit message\n This is the 5th log message'
-description:
-Fifth commit message
-
-
-
diff --git a/tests/test-mq-qrefresh-replace-log-message b/tests/test-mq-qrefresh-replace-log-message.t
old mode 100755
new mode 100644
rename from tests/test-mq-qrefresh-replace-log-message
rename to tests/test-mq-qrefresh-replace-log-message.t
--- a/tests/test-mq-qrefresh-replace-log-message
+++ b/tests/test-mq-qrefresh-replace-log-message.t
@@ -1,55 +1,61 @@
-#!/bin/sh
+Environement setup for MQ
 
-# Environement setup for MQ
-echo "[extensions]" >> $HGRCPATH
-echo "mq=" >> $HGRCPATH
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "mq=" >> $HGRCPATH
+  $ hg init
+  $ hg qinit
 
-#Repo init
-hg init
-hg qinit
+Should fail if no patches applied
 
-echo =======================
-echo "Should fail if no patches applied"
-hg qrefresh
-hg qrefresh -e
+  $ hg qrefresh
+  no patches applied
+  [1]
+  $ hg qrefresh -e
+  no patches applied
+  [1]
+  $ hg qnew -m "First commit message" first-patch
+  $ echo aaaa > file
+  $ hg add file
+  $ hg qrefresh
 
-hg qnew -m "First commit message" first-patch
-echo aaaa > file
-hg add file
-hg qrefresh
-echo =======================
-echo "Should display 'First commit message'"
-hg log -l1 -v | sed -n '/description/,$p'
-echo
+Should display 'First commit message'
+
+  $ hg log -l1 --template "{desc}\n"
+  First commit message
+
+Testing changing message with -m
+
+  $ echo bbbb > file
+  $ hg qrefresh -m "Second commit message"
 
-# Testing changing message with -m
-echo bbbb > file
-hg qrefresh -m "Second commit message"
-echo =======================
-echo "Should display 'Second commit message'"
-hg log -l1 -v | sed -n '/description/,$p'
-echo
+Should display 'Second commit message'
+
+  $ hg log -l1 --template "{desc}\n"
+  Second commit message
+
+Testing changing message with -l
 
+  $ echo "Third commit message" > logfile
+  $ echo " This is the 3rd log message" >> logfile
+  $ echo bbbb > file
+  $ hg qrefresh -l logfile
+
+Should display 'Third commit message\\\n This is the 3rd log message'
 
-# Testing changing message with -l
-echo "Third commit message" > logfile
-echo " This is the 3rd log message" >> logfile
-echo bbbb > file
-hg qrefresh -l logfile
-echo =======================
-printf "Should display 'Third commit message\\\n This is the 3rd log message'\n"
-hg log -l1 -v | sed -n '/description/,$p'
-echo
+  $ hg log -l1 --template "{desc}\n"
+  Third commit message
+   This is the 3rd log message
+
+Testing changing message with -l-
 
-# Testing changing message with -l-
-hg qnew -m "First commit message" second-patch
-echo aaaa > file2
-hg add file2
-echo bbbb > file2
-(echo "Fifth commit message"
-echo " This is the 5th log message" >> logfile) |\
-hg qrefresh -l-
-echo =======================
-printf "Should display 'Fifth commit message\\\n This is the 5th log message'\n"
-hg log -l1 -v | sed -n '/description/,$p'
-echo
+  $ hg qnew -m "First commit message" second-patch
+  $ echo aaaa > file2
+  $ hg add file2
+  $ echo bbbb > file2
+  $ (echo "Fifth commit message"; echo " This is the 5th log message") | hg qrefresh -l-
+
+Should display 'Fifth commit message\\\n This is the 5th log message'
+
+  $ hg log -l1 --template "{desc}\n"
+  Fifth commit message
+   This is the 5th log message