--- a/tests/test-commit.t	Tue Jul 18 19:49:51 2017 -0400
+++ b/tests/test-commit.t	Tue Jul 18 20:34:22 2017 -0400
@@ -103,6 +103,7 @@
   $ hg commit -m commit-15 baz
   abort: baz: file not tracked!
   [255]
+  $ rm baz
 #endif
 
   $ touch quux
@@ -129,18 +130,16 @@
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "commitextras=" >> $HGRCPATH
   $ hg status
-  ? baz
   ? quux
-  $ hg add baz
+  $ hg add quux
+  $ hg commit -m "adding internal used extras" --extra amend_source=hash
+  abort: key 'amend_source' is used internally, can't be set manually
+  [255]
   $ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar
   $ hg log -r . -T '{extras % "{extra}\n"}'
   branch=default
   oldhash=bar
   sourcehash=foo
-  $ hg add quux
-  $ hg commit -m "adding internal used extras" --extra amend_source=hash
-  abort: key 'amend_source' is used internally, can't be set manually
-  [255]
 
 Make sure we do not obscure unknown requires file entries (issue2649)