diff --git a/test/lisp/eshell/eshell.el b/test/lisp/eshell/eshell-tests.el
similarity index 99%
rename from test/lisp/eshell/eshell.el
rename to test/lisp/eshell/eshell-tests.el
index dee6c17e025..363ef525e1b 100644
--- a/test/lisp/eshell/eshell.el
+++ b/test/lisp/eshell/eshell-tests.el
@@ -1,4 +1,4 @@
-;;; tests/eshell.el --- Eshell test suite
+;;; tests/eshell-tests.el --- Eshell test suite
 
 ;; Copyright (C) 1999-2017 Free Software Foundation, Inc.
 
@@ -249,4 +249,4 @@ chars"
 
 (provide 'esh-test)
 
-;;; tests/eshell.el ends here
+;;; tests/eshell-tests.el ends here
diff --git a/test/lisp/net/puny.el b/test/lisp/net/puny-tests.el
similarity index 92%
rename from test/lisp/net/puny.el
rename to test/lisp/net/puny-tests.el
index b119e45d653..b06364e3b37 100644
--- a/test/lisp/net/puny.el
+++ b/test/lisp/net/puny-tests.el
@@ -1,4 +1,4 @@
-;;; puny.el --- tests for net/puny.el  -*- coding: utf-8; -*-
+;;; puny-tests.el --- tests for net/puny.el  -*- coding: utf-8; -*-
 
 ;; Copyright (C) 2017 Free Software Foundation, Inc.
 
@@ -38,4 +38,4 @@
   "Test puny decoding."
   (should (string= (puny-decode-string "xn--9dbdkw") "חנוך")))
 
-;;; puny.el ends here
+;;; puny-tests.el ends here
diff --git a/test/lisp/progmodes/f90.el b/test/lisp/progmodes/f90-tests.el
similarity index 98%
rename from test/lisp/progmodes/f90.el
rename to test/lisp/progmodes/f90-tests.el
index cda39eda376..533a67149e7 100644
--- a/test/lisp/progmodes/f90.el
+++ b/test/lisp/progmodes/f90-tests.el
@@ -1,4 +1,4 @@
-;;; f90.el --- tests for progmodes/f90.el
+;;; f90-tests.el --- tests for progmodes/f90.el
 
 ;; Copyright (C) 2011-2017 Free Software Foundation, Inc.
 
@@ -273,4 +273,4 @@ end program prog")
     (forward-line -2)
     (should (= 2 (current-indentation))))) ; class is
 
-;;; f90.el ends here
+;;; f90-tests.el ends here
diff --git a/test/lisp/vc/vc-hg.el b/test/lisp/vc/vc-hg-tests.el
similarity index 96%
rename from test/lisp/vc/vc-hg.el
rename to test/lisp/vc/vc-hg-tests.el
index 8e4c9739e08..284e06a2052 100644
--- a/test/lisp/vc/vc-hg.el
+++ b/test/lisp/vc/vc-hg-tests.el
@@ -1,4 +1,4 @@
-;;; vc-hg.el --- tests for vc/vc-hg.el
+;;; vc-hg-tests.el --- tests for vc/vc-hg.el
 
 ;; Copyright (C) 2016-2017 Free Software Foundation, Inc.
 
@@ -55,4 +55,4 @@
     (save-excursion (insert "philringnalda 218075 2014-11-28 CLOBBER:"))
     (should (floatp (vc-hg-annotate-time)))))
 
-;;; vc-hg.el ends here
+;;; vc-hg-tests.el ends here