diff --git a/.gitattributes b/.gitattributes
index db68e31732..dbee2494a4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1037,7 +1037,6 @@ components/codetools/tests/moduletests/rt_explodewith.pas svneol=native#text/pla
 components/codetools/tests/parsertbase.pas svneol=native#text/plain
 components/codetools/tests/parsertest.lpi svneol=native#text/plain
 components/codetools/tests/parsertest.lpr svneol=native#text/plain
-components/codetools/tests/refactoringtests.pas svneol=native#text/plain
 components/codetools/tests/testbasiccodetools.pas svneol=native#text/plain
 components/codetools/tests/testcfgscript.pas svneol=native#text/plain
 components/codetools/tests/testcodetools.lpi svneol=native#text/plain
@@ -1048,6 +1047,7 @@ components/codetools/tests/testctrangescan.pas svneol=native#text/plain
 components/codetools/tests/testctxmlfixfragments.pas svneol=native#text/pascal
 components/codetools/tests/testfinddeclaration.pas svneol=native#text/plain
 components/codetools/tests/testmethodjumptool.pas svneol=native#text/plain
+components/codetools/tests/testrefactoring.pas svneol=native#text/plain
 components/codetools/tests/teststdcodetools.pas svneol=native#text/plain
 components/codetools/unitdictionary.pas svneol=native#text/plain
 components/compilers/c/examples/test.c svneol=native#text/plain
diff --git a/components/codetools/tests/testcodetools.lpi b/components/codetools/tests/testcodetools.lpi
index ad112906c1..9e19599d07 100644
--- a/components/codetools/tests/testcodetools.lpi
+++ b/components/codetools/tests/testcodetools.lpi
@@ -45,6 +45,7 @@
       <Unit1>
         <Filename Value="testfinddeclaration.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="TestFinddeclaration"/>
       </Unit1>
       <Unit2>
         <Filename Value="fdt_typehelper.pas"/>
@@ -75,9 +76,9 @@
         <IsPartOfProject Value="True"/>
       </Unit8>
       <Unit9>
-        <Filename Value="refactoringtests.pas"/>
+        <Filename Value="testrefactoring.pas"/>
         <IsPartOfProject Value="True"/>
-        <UnitName Value="RefactoringTests"/>
+        <UnitName Value="TestRefactoring"/>
       </Unit9>
       <Unit10>
         <Filename Value="rt_explodewith.pas"/>
diff --git a/components/codetools/tests/testcodetools.lpr b/components/codetools/tests/testcodetools.lpr
index 96bc2f3d97..1d16cee171 100644
--- a/components/codetools/tests/testcodetools.lpr
+++ b/components/codetools/tests/testcodetools.lpr
@@ -24,7 +24,7 @@ uses
   CodeToolManager, CodeToolsConfig,
   testglobals,
   TestBasicCodetools, TestCTRangeScan, TestMethodJumpTool, TestStdCodetools,
-  testfinddeclaration, TestCompleteBlock, RefactoringTests,
+  TestFinddeclaration, TestCompleteBlock, TestRefactoring,
   // non Pascal
   TestCfgScript, TestCTH2Pas, TestCTXMLFixFragments,
   // compile test files to make sure they are valid Pascal
diff --git a/components/codetools/tests/refactoringtests.pas b/components/codetools/tests/testrefactoring.pas
similarity index 99%
rename from components/codetools/tests/refactoringtests.pas
rename to components/codetools/tests/testrefactoring.pas
index 62d9033927..1a09daec58 100644
--- a/components/codetools/tests/refactoringtests.pas
+++ b/components/codetools/tests/testrefactoring.pas
@@ -3,7 +3,7 @@
    ./testcodetools --format=plain --suite=TTestRefactoring
    ./testcodetools --format=plain --suite=TestExplodeWith
 }
-unit RefactoringTests;
+unit TestRefactoring;
 
 {$mode objfpc}{$H+}