diff --git a/test/bugs/testfileutil.pas b/test/bugs/testfileutil.pas
index eb6fc77dc3..bdefbd7646 100644
--- a/test/bugs/testfileutil.pas
+++ b/test/bugs/testfileutil.pas
@@ -97,7 +97,6 @@ begin
 end;
 
 initialization
-  // Maybe this test case should be moved to another testsuite, e.g. lcl test
-  AddToBugsTestSuite(TTestSuite.Create(TTestFileUtil, 'TestFileUtil'));
+  AddToLazUtilsTestSuite(TTestFileUtil);
 end.
 
diff --git a/test/runtests.lpi b/test/runtests.lpi
index 843282750e..68ab24b3e7 100644
--- a/test/runtests.lpi
+++ b/test/runtests.lpi
@@ -82,7 +82,7 @@
         <PackageName Value="LCL"/>
       </Item4>
     </RequiredPackages>
-    <Units Count="12">
+    <Units Count="13">
       <Unit0>
         <Filename Value="runtests.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -136,6 +136,11 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="TestLazUTF16"/>
       </Unit11>
+      <Unit12>
+        <Filename Value="lazutils\testlazfileutils.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="TestLazFileUtils"/>
+      </Unit12>
     </Units>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/test/runtests.lpr b/test/runtests.lpr
index 3d8afdf5f7..c8c4a9c2d4 100644
--- a/test/runtests.lpr
+++ b/test/runtests.lpr
@@ -25,7 +25,7 @@ uses
   testglobals, testunits, dom,
   {Unit needed to set the LCL version and widget set name}
   LCLVersion, InterfaceBase, LCLPlatformDef, Interfaces, TestLazXML,
-  TestAvgLvlTree, TestLConvEncoding;
+  TestAvgLvlTree, TestLConvEncoding, testlazfileutils;
   
 type