diff --git a/ide/buildmanager.pas b/ide/buildmanager.pas
index 7dc6792faf..6551c3050a 100644
--- a/ide/buildmanager.pas
+++ b/ide/buildmanager.pas
@@ -421,6 +421,8 @@ begin
 end;
 
 function TBuildManager.GetTestProjectFilename(aProject: TProject): string;
+var
+  TestDir: String;
 begin
   Result:='';
   if aProject=nil then exit;
@@ -428,6 +430,12 @@ begin
   Result:=GetTestUnitFilename(aProject.MainUnitInfo);
   if Result='' then exit;
   Result:=aProject.CompilerOptions.CreateTargetFilename(Result);
+  if Result='' then exit;
+  if (not FilenameIsAbsolute(Result)) then begin
+    TestDir:=GetTestBuildDirectory;
+    if TestDir='' then exit;
+    Result:=TestDir+Result;
+  end;
 end;
 
 function TBuildManager.GetTestUnitFilename(AnUnitInfo: TUnitInfo): string;
diff --git a/ide/main.pp b/ide/main.pp
index e84d5c6055..5b5435a03f 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -9851,6 +9851,7 @@ begin
 
   // Check project build
   ProgramFilename := MainBuildBoss.GetProjectTargetFilename(Project1);
+  DebugLn(['TMainIDE.DoInitProjectRun ProgramFilename=',ProgramFilename]);
   if not FileExistsUTF8(ProgramFilename)
   then begin
     MessageDlg(lisFileNotFound,