diff --git a/src/Main/Base/Project/Src/Util/ProcessRunner.cs b/src/Main/Base/Project/Src/Util/ProcessRunner.cs
index f52f68b8d4..7401e1717b 100644
--- a/src/Main/Base/Project/Src/Util/ProcessRunner.cs
+++ b/src/Main/Base/Project/Src/Util/ProcessRunner.cs
@@ -119,7 +119,7 @@ namespace ICSharpCode.SharpDevelop.Util
 			bool exited = process.WaitForExit(timeout);
 			
 			if (exited) {
-				endOfOutput.WaitOne(timeout, false);
+				endOfOutput.WaitOne(timeout == int.MaxValue ? Timeout.Infinite : timeout, false);
 			}
 			
 			return exited;
diff --git a/src/Main/Base/Test/StandardOutputFromProcessTestFixture.cs b/src/Main/Base/Test/StandardOutputFromProcessTestFixture.cs
index ff0459d9d4..bc703e3320 100644
--- a/src/Main/Base/Test/StandardOutputFromProcessTestFixture.cs
+++ b/src/Main/Base/Test/StandardOutputFromProcessTestFixture.cs
@@ -97,7 +97,7 @@ namespace ICSharpCode.SharpDevelop.Tests
 				string outputText = GetOutputText();
 				CreateTextFile(fullFilename, outputText);
 				runner.Start(GetConsoleAppFileName(), String.Concat("-file:", filename));
-				bool exited = runner.WaitForExit(500);
+				bool exited = runner.WaitForExit(5000);
 				
 				Assert.IsTrue(exited, "App did not exit.");
 				Assert.IsFalse(runner.IsRunning, "IsRunning should be false.");
@@ -131,7 +131,7 @@ namespace ICSharpCode.SharpDevelop.Tests
 				string outputText = GetOutputText();
 				CreateTextFile(fullFilename, outputText);
 				runner.Start(GetConsoleAppFileName(), String.Concat("-error.file:", filename));
-				bool exited = runner.WaitForExit(500);
+				bool exited = runner.WaitForExit(5000);
 				
 				Assert.IsTrue(exited, "App did not exit.");
 				Assert.IsFalse(runner.IsRunning, "IsRunning should be false.");