diff --git a/components/codetools/tests/runtestscodetools.lpi b/components/codetools/tests/runtestscodetools.lpi
index 6b93ee73b2..a152f24a3f 100644
--- a/components/codetools/tests/runtestscodetools.lpi
+++ b/components/codetools/tests/runtestscodetools.lpi
@@ -37,7 +37,7 @@
         <PackageName Value="fpcunitconsolerunner"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="16">
+    <Units Count="10">
       <Unit0>
         <Filename Value="runtestscodetools.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -48,64 +48,43 @@
         <UnitName Value="TestFindDeclaration"/>
       </Unit1>
       <Unit2>
-        <Filename Value="fdt_typehelper.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit2>
-      <Unit3>
-        <Filename Value="fdt_nestedclasses.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit3>
-      <Unit4>
-        <Filename Value="fdt_classof.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit4>
-      <Unit5>
-        <Filename Value="fdt_objccategory.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit5>
-      <Unit6>
-        <Filename Value="fdt_classhelper.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit6>
-      <Unit7>
-        <Filename Value="fdt_objcclass.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit7>
-      <Unit8>
-        <Filename Value="fdt_with.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit8>
-      <Unit9>
         <Filename Value="testrefactoring.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TestRefactoring"/>
-      </Unit9>
-      <Unit10>
-        <Filename Value="rt_explodewith.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit10>
-      <Unit11>
-        <Filename Value="fdt_generics.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit11>
-      <Unit12>
+      </Unit2>
+      <Unit3>
         <Filename Value="testglobals.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TestGlobals"/>
-      </Unit12>
-      <Unit13>
+      </Unit3>
+      <Unit4>
         <Filename Value="testpascalparser.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="TestPascalParser"/>
-      </Unit13>
-      <Unit14>
+      </Unit4>
+      <Unit5>
         <Filename Value="moduletests/fdt_proc_basetypes.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit14>
-      <Unit15>
+      </Unit5>
+      <Unit6>
         <Filename Value="moduletests/fdt_for_in.pas"/>
         <IsPartOfProject Value="True"/>
-      </Unit15>
+      </Unit6>
+      <Unit7>
+        <Filename Value="testmethodjumptool.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestMethodJumpTool"/>
+      </Unit7>
+      <Unit8>
+        <Filename Value="teststdcodetools.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestStdCodetools"/>
+      </Unit8>
+      <Unit9>
+        <Filename Value="testcth2pas.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestCTH2Pas"/>
+      </Unit9>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/components/codetools/tests/runtestscodetools.lpr b/components/codetools/tests/runtestscodetools.lpr
index 4992fe9766..dd33f979b4 100644
--- a/components/codetools/tests/runtestscodetools.lpr
+++ b/components/codetools/tests/runtestscodetools.lpr
@@ -31,16 +31,11 @@ uses
   TestGlobals,
   // non Pascal
   TestCfgScript, TestCTH2Pas, TestCTXMLFixFragments,
-  // compile test files to make sure they are valid Pascal
-  fdt_classhelper,
   {$IF FPC_FULLVERSION >= 30101}
-  fdt_typehelper,
   {$ENDIF}
-  fdt_nestedclasses,
   {$IFDEF Darwin}
   fdt_objccategory, fdt_objcclass,
   {$ENDIF}
-  fdt_classof, fdt_with, rt_explodewith, fdt_generics,
   TestBasicCodetools,
   TestCTRangeScan, TestPascalParser, TestMethodJumpTool, TestStdCodetools,
   TestFindDeclaration, TestCompleteBlock, TestRefactoring;
diff --git a/components/codetools/tests/testmethodjumptool.pas b/components/codetools/tests/testmethodjumptool.pas
index 823f349f89..96f529a2d4 100644
--- a/components/codetools/tests/testmethodjumptool.pas
+++ b/components/codetools/tests/testmethodjumptool.pas
@@ -10,7 +10,7 @@ unit TestMethodJumpTool;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, fpcunit, testregistry,
+  Classes, SysUtils, fpcunit, testregistry, LazLoggerBase,
   CodeToolManager, StdCodeTools, CodeCache, LinkScanner;
 
 type
diff --git a/components/codetools/tests/teststdcodetools.pas b/components/codetools/tests/teststdcodetools.pas
index 7a21612b54..f089e528a6 100644
--- a/components/codetools/tests/teststdcodetools.pas
+++ b/components/codetools/tests/teststdcodetools.pas
@@ -11,7 +11,7 @@ unit TestStdCodetools;
 interface
 
 uses
-  Classes, SysUtils, LCLProc, fpcunit, testregistry,
+  Classes, SysUtils, LazLoggerBase, fpcunit, testregistry,
   CodeToolManager, StdCodeTools, CodeCache, LinkScanner;
 
 type