diff --git a/tests/test-acl.t b/tests/test-acl.t
--- a/tests/test-acl.t
+++ b/tests/test-acl.t
@@ -1734,5 +1734,3 @@ Disable the fakegroups trick to get real
   acl: "unlikelytoexist" not defined in [acl.groups]
   error: pretxnchangegroup.acl hook failed: group 'unlikelytoexist' is undefined
   abort: group 'unlikelytoexist' is undefined
-
-  $ true
diff --git a/tests/test-addremove-similar.t b/tests/test-addremove-similar.t
--- a/tests/test-addremove-similar.t
+++ b/tests/test-addremove-similar.t
@@ -98,5 +98,3 @@ copies here
   $ hg addremove -s80
   adding c
   recording removal of d/a as rename to c (100% similar)
-
-  $ true
diff --git a/tests/test-bookmarks-pushpull.t b/tests/test-bookmarks-pushpull.t
--- a/tests/test-bookmarks-pushpull.t
+++ b/tests/test-bookmarks-pushpull.t
@@ -64,4 +64,3 @@ push/pull name that doesn't exist
   $ hg pull -B anotherbadname ../a
   abort: remote bookmark anotherbadname not found!
   [255]
-  $ true
diff --git a/tests/test-bookmarks.t b/tests/test-bookmarks.t
--- a/tests/test-bookmarks.t
+++ b/tests/test-bookmarks.t
@@ -187,5 +187,3 @@ bookmark name with whitespace only
   $ hg bookmark ' '
   abort: bookmark names cannot consist entirely of whitespace
   [255]
-
-  $ true
diff --git a/tests/test-committer.t b/tests/test-committer.t
--- a/tests/test-committer.t
+++ b/tests/test-committer.t
@@ -61,5 +61,3 @@
   rollback completed
   abort: empty username!
   [255]
-
-  $ true
diff --git a/tests/test-diffdir.t b/tests/test-diffdir.t
--- a/tests/test-diffdir.t
+++ b/tests/test-diffdir.t
@@ -38,5 +38,3 @@
   $ hg diff -r tip -r ""
   abort: 00changelog.i@: ambiguous identifier!
   [255]
-
-  $ true
diff --git a/tests/test-empty-dir.t b/tests/test-empty-dir.t
--- a/tests/test-empty-dir.t
+++ b/tests/test-empty-dir.t
@@ -21,5 +21,3 @@
   $ test -d sub || echo "sub not present"
   sub not present
 
-  $ true
-
diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -171,5 +171,3 @@ Test extdiff with --option:
   diffing this a.8a5febb7f867/a a.34eed99112ab/a
   [1]
 
-  $ true
-
diff --git a/tests/test-identify.t b/tests/test-identify.t
--- a/tests/test-identify.t
+++ b/tests/test-identify.t
@@ -67,5 +67,3 @@ remote with tags?
   $ hg id -t http://localhost:$HGPORT1/
   abort: can't query remote revision number, branch, or tags
   [255]
-
-  $ true # ends with util.Abort -> returns 255
diff --git a/tests/test-install.t b/tests/test-install.t
--- a/tests/test-install.t
+++ b/tests/test-install.t
@@ -20,5 +20,3 @@ hg debuginstall with no username
    (specify a username in your configuration file)
   1 problems detected, please check your install!
   [1]
-
-  $ true
diff --git a/tests/test-issue433.t b/tests/test-issue433.t
--- a/tests/test-issue433.t
+++ b/tests/test-issue433.t
@@ -8,6 +8,3 @@ http://mercurial.selenic.com/bts/issue43
   $ hg parents -r 0 doesnotexist
   abort: 'doesnotexist' not found in manifest!
   [255]
-
-  $ true
-
diff --git a/tests/test-issue619.t b/tests/test-issue619.t
--- a/tests/test-issue619.t
+++ b/tests/test-issue619.t
@@ -27,5 +27,3 @@ Bogus fast-forward should fail:
   abort: merging with a working directory ancestor has no effect
   [255]
 
-  $ true
-
diff --git a/tests/test-manifest.t b/tests/test-manifest.t
--- a/tests/test-manifest.t
+++ b/tests/test-manifest.t
@@ -63,7 +63,3 @@ The next two calls are expected to abort
   $ hg manifest -r tip tip
   abort: please specify just one revision
   [255]
-
-
-  $ true
-
diff --git a/tests/test-merge9.t b/tests/test-merge9.t
--- a/tests/test-merge9.t
+++ b/tests/test-merge9.t
@@ -90,5 +90,3 @@ after
   $ hg resolve -l
   U bar
   R baz
-
-  $ true
diff --git a/tests/test-paths.t b/tests/test-paths.t
--- a/tests/test-paths.t
+++ b/tests/test-paths.t
@@ -14,4 +14,3 @@
   comparing with .*/test-paths.t/b
   no changes found
   [1]
-  $ true
diff --git a/tests/test-push-validation.t b/tests/test-push-validation.t
--- a/tests/test-push-validation.t
+++ b/tests/test-push-validation.t
@@ -50,5 +50,3 @@ Expected to fail:
   abort: missing file data for beta:dddc47b3ba30e54484720ce0f4f768a0f4b6efb9 - run hg verify
   [255]
 
-  $ true
-
diff --git a/tests/test-requires.t b/tests/test-requires.t
--- a/tests/test-requires.t
+++ b/tests/test-requires.t
@@ -12,5 +12,3 @@
   $ hg tip
   abort: requirement 'indoor-pool' not supported!
   [255]
-
-  $ true
diff --git a/tests/test-username-newline.t b/tests/test-username-newline.t
--- a/tests/test-username-newline.t
+++ b/tests/test-username-newline.t
@@ -23,5 +23,3 @@
   abort: username 'foo\nbar3' contains a newline!
   [255]
 
-  $ true
-