diff --git a/CI/file_name_exceptions.txt b/CI/file_name_exceptions.txt
index 185b4ba995..424dc3f691 100644
--- a/CI/file_name_exceptions.txt
+++ b/CI/file_name_exceptions.txt
@@ -23,10 +23,6 @@ apps/components_tests/lua/test_yaml.cpp
 apps/components_tests/misc/test_endianness.cpp
 apps/components_tests/misc/test_resourcehelpers.cpp
 apps/components_tests/misc/test_stringops.cpp
-apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
-apps/openmw_tests/mwscript/test_scripts.cpp
-apps/openmw_tests/mwscript/test_utils.hpp
-apps/openmw_tests/mwworld/test_store.cpp
 components/crashcatcher/windows_crashcatcher.cpp
 components/crashcatcher/windows_crashcatcher.hpp
 components/crashcatcher/windows_crashmonitor.cpp
diff --git a/apps/openmw_tests/CMakeLists.txt b/apps/openmw_tests/CMakeLists.txt
index 9b57113110..4e57d610a3 100644
--- a/apps/openmw_tests/CMakeLists.txt
+++ b/apps/openmw_tests/CMakeLists.txt
@@ -6,14 +6,14 @@ file(GLOB UNITTEST_SRC_FILES
 
     options.cpp
 
-    mwworld/test_store.cpp
+    mwworld/teststore.cpp
     mwworld/testduration.cpp
     mwworld/testtimestamp.cpp
     mwworld/testptr.cpp
 
-    mwdialogue/test_keywordsearch.cpp
+    mwdialogue/testkeywordsearch.cpp
 
-    mwscript/test_scripts.cpp
+    mwscript/testscripts.cpp
 )
 
 source_group(apps\\openmw-tests FILES ${UNITTEST_SRC_FILES})
diff --git a/apps/openmw_tests/mwdialogue/test_keywordsearch.cpp b/apps/openmw_tests/mwdialogue/testkeywordsearch.cpp
similarity index 100%
rename from apps/openmw_tests/mwdialogue/test_keywordsearch.cpp
rename to apps/openmw_tests/mwdialogue/testkeywordsearch.cpp
diff --git a/apps/openmw_tests/mwscript/test_scripts.cpp b/apps/openmw_tests/mwscript/testscripts.cpp
similarity index 99%
rename from apps/openmw_tests/mwscript/test_scripts.cpp
rename to apps/openmw_tests/mwscript/testscripts.cpp
index 0de542bdc6..b9e422daed 100644
--- a/apps/openmw_tests/mwscript/test_scripts.cpp
+++ b/apps/openmw_tests/mwscript/testscripts.cpp
@@ -1,7 +1,7 @@
 #include <gtest/gtest.h>
 #include <sstream>
 
-#include "test_utils.hpp"
+#include "testutils.hpp"
 
 namespace
 {
@@ -935,4 +935,4 @@ End)mwscript";
         registerExtensions();
         EXPECT_FALSE(!compile(sIssue6807));
     }
-}
\ No newline at end of file
+}
diff --git a/apps/openmw_tests/mwscript/test_utils.hpp b/apps/openmw_tests/mwscript/testutils.hpp
similarity index 100%
rename from apps/openmw_tests/mwscript/test_utils.hpp
rename to apps/openmw_tests/mwscript/testutils.hpp
diff --git a/apps/openmw_tests/mwworld/test_store.cpp b/apps/openmw_tests/mwworld/teststore.cpp
similarity index 100%
rename from apps/openmw_tests/mwworld/test_store.cpp
rename to apps/openmw_tests/mwworld/teststore.cpp