diff --git a/components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas b/components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas
index 5d6d8258ec..471f864b30 100644
--- a/components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas
+++ b/components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas
@@ -5,9 +5,8 @@ unit TestBase;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, fpcunit, testutils, testregistry,
-  LCLProc, LazLogger, DbgIntfDebuggerBase, CompileHelpers, Dialogs, TestGDBMIControl,
-  GDBMIDebugger; // , FpGdbmiDebugger;
+  Classes, SysUtils, FileUtil, fpcunit, testutils, testregistry, LCLProc, LazLogger,
+  LazFileUtils, DbgIntfDebuggerBase, CompileHelpers, Dialogs, TestGDBMIControl, GDBMIDebugger; // , FpGdbmiDebugger;
   // EnvironmentOpts, ExtToolDialog, TransferMacros,
 
 (*
diff --git a/components/lazdebuggergdbmi/test/gdbmitestutils/testgdbmicontrol.pas b/components/lazdebuggergdbmi/test/gdbmitestutils/testgdbmicontrol.pas
index f3edfd7e8e..72b0a45196 100644
--- a/components/lazdebuggergdbmi/test/gdbmitestutils/testgdbmicontrol.pas
+++ b/components/lazdebuggergdbmi/test/gdbmitestutils/testgdbmicontrol.pas
@@ -5,8 +5,8 @@ unit TestGDBMIControl;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls,
-  CheckLst, testregistry, fpcunit, GuiTestRunner;
+  Classes, SysUtils, FileUtil, LazFileUtils, Forms, Controls, Graphics, Dialogs, StdCtrls,
+  ExtCtrls, CheckLst, testregistry, fpcunit, GuiTestRunner;
 
 type
 
diff --git a/components/lazdebuggergdbmi/test/testargv.pas b/components/lazdebuggergdbmi/test/testargv.pas
index 10a65ea6fb..65de8f33d4 100644
--- a/components/lazdebuggergdbmi/test/testargv.pas
+++ b/components/lazdebuggergdbmi/test/testargv.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   SysUtils, fpcunit, testutils, testregistry, TestGDBMIControl,
-  TestBase, GDBMIDebugger, LCLProc, FileUtil, DbgIntfDebuggerBase, TestWatches;
+  TestBase, GDBMIDebugger, LCLProc, FileUtil, LazUTF8, DbgIntfDebuggerBase, TestWatches;
 
 const
   BREAK_LINE_ARGV = 26;