diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
deleted file mode 100644
--- a/tests/test-check-code-hg.t
+++ /dev/null
@@ -1,15 +0,0 @@
-#require test-repo
-
-  $ check_code="$TESTDIR"/../contrib/check-code.py
-  $ cd "$TESTDIR"/..
-
-New errors are not allowed. Warnings are strongly discouraged.
-(The writing "no-che?k-code" is for not skipping this file when checking.)
-
-  $ hg locate | sed 's-\\-/-g' |
-  >   xargs "$check_code" --warnings --per-file=0 || false
-  Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)
-  Skipping i18n/polib.py it has no-che?k-code (glob)
-  Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
-  Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
-  Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)
diff --git a/tests/test-check-code.t b/tests/test-check-code.t
new file mode 100644
--- /dev/null
+++ b/tests/test-check-code.t
@@ -0,0 +1,15 @@
+#require test-repo
+
+  $ check_code="$TESTDIR"/../contrib/check-code.py
+  $ cd "$TESTDIR"/..
+
+New errors are not allowed. Warnings are strongly discouraged.
+(The writing "no-che?k-code" is for not skipping this file when checking.)
+
+  $ hg locate | sed 's-\\-/-g' |
+  >   xargs "$check_code" --warnings --per-file=0 || false
+  Skipping hgext/zeroconf/Zeroconf.py it has no-che?k-code (glob)
+  Skipping i18n/polib.py it has no-che?k-code (glob)
+  Skipping mercurial/httpclient/__init__.py it has no-che?k-code (glob)
+  Skipping mercurial/httpclient/_readers.py it has no-che?k-code (glob)
+  Skipping mercurial/httpclient/socketutil.py it has no-che?k-code (glob)
diff --git a/tests/test-check-commit-hg.t b/tests/test-check-commit.t
rename from tests/test-check-commit-hg.t
rename to tests/test-check-commit.t
diff --git a/tests/test-check-config-hg.t b/tests/test-check-config.t
rename from tests/test-check-config-hg.t
rename to tests/test-check-config.t