diff --git a/tests/datetime/datetime.cpp b/tests/datetime/datetimetest.cpp
similarity index 100%
rename from tests/datetime/datetime.cpp
rename to tests/datetime/datetimetest.cpp
diff --git a/tests/fileconf/fileconf.cpp b/tests/fileconf/fileconftest.cpp
similarity index 100%
rename from tests/fileconf/fileconf.cpp
rename to tests/fileconf/fileconftest.cpp
diff --git a/tests/filename/filename.cpp b/tests/filename/filenametest.cpp
similarity index 100%
rename from tests/filename/filename.cpp
rename to tests/filename/filenametest.cpp
diff --git a/tests/filesys/filesys.cpp b/tests/filesys/filesystest.cpp
similarity index 100%
rename from tests/filesys/filesys.cpp
rename to tests/filesys/filesystest.cpp
diff --git a/tests/fontmap/fontmap.cpp b/tests/fontmap/fontmaptest.cpp
similarity index 100%
rename from tests/fontmap/fontmap.cpp
rename to tests/fontmap/fontmaptest.cpp
diff --git a/tests/formatconverter/formatconverter.cpp b/tests/formatconverter/formatconvertertest.cpp
similarity index 100%
rename from tests/formatconverter/formatconverter.cpp
rename to tests/formatconverter/formatconvertertest.cpp
diff --git a/tests/longlong/longlong.cpp b/tests/longlong/longlongtest.cpp
similarity index 100%
rename from tests/longlong/longlong.cpp
rename to tests/longlong/longlongtest.cpp
diff --git a/tests/mbconv/main.cpp b/tests/mbconv/mbconvtest.cpp
similarity index 100%
rename from tests/mbconv/main.cpp
rename to tests/mbconv/mbconvtest.cpp
diff --git a/tests/regex/regex.cpp b/tests/regex/regextest.cpp
similarity index 100%
rename from tests/regex/regex.cpp
rename to tests/regex/regextest.cpp
diff --git a/tests/regex/wxregex.cpp b/tests/regex/wxregextest.cpp
similarity index 100%
rename from tests/regex/wxregex.cpp
rename to tests/regex/wxregextest.cpp
diff --git a/tests/test.bkl b/tests/test.bkl
index 0323cdd6e7..64bfcc7c67 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -10,17 +10,17 @@
         <sources>
             test.cpp
             arrays/arrays.cpp
-            datetime/datetime.cpp
-            fileconf/fileconf.cpp
-            filename/filename.cpp
-            filesys/filesys.cpp
-            fontmap/fontmap.cpp
-            formatconverter/formatconverter.cpp
+            datetime/datetimetest.cpp
+            fileconf/fileconftest.cpp
+            filename/filenametest.cpp
+            filesys/filesystest.cpp
+            fontmap/fontmaptest.cpp
+            formatconverter/formatconvertertest.cpp
             hashes/hashes.cpp
-            longlong/longlong.cpp
-            mbconv/main.cpp
-            regex/regex.cpp
-            regex/wxregex.cpp
+            longlong/longlongtest.cpp
+            mbconv/mbconvtest.cpp
+            regex/regextest.cpp
+            regex/wxregextest.cpp
             strings/strings.cpp
             strings/stdstrings.cpp
             strings/unicode.cpp