diff --git a/tests/test-fix-topology.t b/tests/test-fix-topology.t
--- a/tests/test-fix-topology.t
+++ b/tests/test-fix-topology.t
@@ -1,3 +1,5 @@
+#testcases obsstore-off obsstore-on
+
 A script that implements uppercasing all letters in a file.
 
   $ UPPERCASEPY="$TESTTMP/uppercase.py"
@@ -30,7 +32,6 @@
 we'll test it with evolution off and on. This only changes the revision
 numbers, if all is well.
 
-#testcases obsstore-off obsstore-on
 #if obsstore-on
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
diff --git a/tests/test-narrow-sparse.t b/tests/test-narrow-sparse.t
--- a/tests/test-narrow-sparse.t
+++ b/tests/test-narrow-sparse.t
@@ -1,7 +1,8 @@
+#testcases tree flat
+
 Testing interaction of sparse and narrow when both are enabled on the client
 side and we do a non-ellipsis clone
 
-#testcases tree flat
   $ . "$TESTDIR/narrow-library.sh"
   $ cat << EOF >> $HGRCPATH
   > [extensions]
diff --git a/tests/test-push-race.t b/tests/test-push-race.t
--- a/tests/test-push-race.t
+++ b/tests/test-push-race.t
@@ -1,3 +1,5 @@
+#testcases strict unrelated
+
 ============================================================================================
 Test cases where there are race condition between two clients pushing to the same repository
 ============================================================================================
@@ -7,6 +9,10 @@
 perform its push. The "raced" client starts its actual push after the "racing"
 client push is fully complete.
 
+We tests multiple cases:
+* strict: no race detected,
+* unrelated: race on unrelated heads are allowed.
+
 A set of extension and shell functions ensures this scheduling.
 
   $ cat >> delaypush.py << EOF
@@ -113,12 +119,6 @@
   > graph = log -G --rev 'sort(all(), "topo")'
   > EOF
 
-We tests multiple cases:
-* strict: no race detected,
-* unrelated: race on unrelated heads are allowed.
-
-#testcases strict unrelated
-
 #if strict
 
   $ cat >> $HGRCPATH << EOF