diff --git a/components/lazdebuggers/lazdebuggerfp/test/testbreakpoint.pas b/components/lazdebuggers/lazdebuggerfp/test/testbreakpoint.pas
index 407697eb00..56cc8dc86f 100644
--- a/components/lazdebuggers/lazdebuggerfp/test/testbreakpoint.pas
+++ b/components/lazdebuggers/lazdebuggerfp/test/testbreakpoint.pas
@@ -959,7 +959,7 @@ begin
     for j := 1 to 70 do begin
       for i := 0 to 9 do begin
 
-        Debugger.RunToNextPause(dcRun, 30000);
+        Debugger.RunToNextPause(dcRun, 90000);
         AssertDebuggerState(dsPause, 'in loop');
         TestEquals('ThreadId', ThreadIdMain, dbg.Threads.CurrentThreads.CurrentThreadId);
         TestLocation('loop '+IntToStr(j)+', '+IntToStr(i), 'BrkMain'+IntToStr(i), j);
diff --git a/components/lazdebuggers/lazdebuggerfp/test/teststepping.pas b/components/lazdebuggers/lazdebuggerfp/test/teststepping.pas
index 5bbe007a2a..9e6f8b9a8a 100644
--- a/components/lazdebuggers/lazdebuggerfp/test/teststepping.pas
+++ b/components/lazdebuggers/lazdebuggerfp/test/teststepping.pas
@@ -279,7 +279,7 @@ begin
 
     // This test can take longer, as the new thread gets very little scheduler time
     // during the single stepping of the main thread.
-    RunToNextPauseNoLoopBreak('', dcStepOver, 35000);
+    RunToNextPauseNoLoopBreak('', dcStepOver, 55000);
     AssertDebuggerState(dsPause);
     TestLocation('At AfterThreadCreateInStep', 'AfterThreadCreateInStep', -1);
     TestEquals('ThreadId AfterThreadCreateInStep', ThreadIdMain, dbg.Threads.CurrentThreads.CurrentThreadId);
@@ -1162,7 +1162,7 @@ begin
   if AnExpAtBrkName <> '' then
     AName := AName + ' (TO: '+AnExpAtBrkName+')';
   THookedFpDebugDebugger(dbg).LockRelCount := 0;
-  Result := RunToNextPauseNoInternal(AName, ACmd);
+  Result := RunToNextPauseNoInternal(AName, ACmd, ATimeOut);
 
   // LockRelease called in 2 * DoState / 1 * DebugLoopFinished
   if not TestEquals(AName + ' ' + dbgs(ACmd)+' - lock cnt', 3, THookedFpDebugDebugger(dbg).LockRelCount)
diff --git a/components/lazdebuggers/lazdebugtestbase/testdbgtestsuites.pas b/components/lazdebuggers/lazdebugtestbase/testdbgtestsuites.pas
index e0acb1710e..c7debcc9ec 100644
--- a/components/lazdebuggers/lazdebugtestbase/testdbgtestsuites.pas
+++ b/components/lazdebuggers/lazdebugtestbase/testdbgtestsuites.pas
@@ -102,8 +102,8 @@ type
     Procedure TestCompile(const Prg: TCommonSource; out ExeName: string; const UsesDirs: array of TUsesDir;
                           NamePostFix: String=''; ExtraArgs: String=''); overload;
 
-    function RunToNextPauseTestInternal(AName: String; AnInternalCntExp: Integer; ACmd: TDBGCommand; ATimeOut: Integer = 5000; AWaitForInternal: Boolean = False): Boolean;
-    function RunToNextPauseNoInternal(AName: String; ACmd: TDBGCommand; ATimeOut: Integer = 5000; AWaitForInternal: Boolean = False): Boolean;
+    function RunToNextPauseTestInternal(AName: String; AnInternalCntExp: Integer; ACmd: TDBGCommand; ATimeOut: Integer = 15000; AWaitForInternal: Boolean = False): Boolean;
+    function RunToNextPauseNoInternal(AName: String; ACmd: TDBGCommand; ATimeOut: Integer = 15000; AWaitForInternal: Boolean = False): Boolean;
 
     // Logging
     procedure LogText(const s: string; CopyToTestLogger: Boolean = False);
diff --git a/components/lazdebuggers/lazdebugtestbase/ttestdbgexecuteables.pas b/components/lazdebuggers/lazdebugtestbase/ttestdbgexecuteables.pas
index 4b9fb5d244..7f052b7b81 100644
--- a/components/lazdebuggers/lazdebugtestbase/ttestdbgexecuteables.pas
+++ b/components/lazdebuggers/lazdebugtestbase/ttestdbgexecuteables.pas
@@ -119,8 +119,8 @@ type
     function StartDebugger(AppDir, TestExeName: String): boolean; virtual;
     procedure FreeDebugger;
     procedure ClearDbgStateCounts;
-    function RunToNextPause(ACmd: TDBGCommand; ATimeOut: Integer = 5000; AWaitForInternal: Boolean = False): Boolean;
-    function WaitForFinishRun(ATimeOut: Integer = 5000; AWaitForInternal: Boolean = False): Boolean;
+    function RunToNextPause(ACmd: TDBGCommand; ATimeOut: Integer = 15000; AWaitForInternal: Boolean = False): Boolean;
+    function WaitForFinishRun(ATimeOut: Integer = 15000; AWaitForInternal: Boolean = False): Boolean;
 
     function SetBreakPoint(AFileName: String; ALine: Integer): TDBGBreakPoint;
     function SetBreakPoint(ACommonSource: TCommonSource; AName: String): TDBGBreakPoint;