diff --git a/Test.hs b/Test.hs
index 88c2b6e8cd..259a60400f 100644
--- a/Test.hs
+++ b/Test.hs
@@ -2116,9 +2116,8 @@ setTestMode testmode = do
 runFakeSsh :: [String] -> IO ()
 runFakeSsh ("-n":ps) = runFakeSsh ps
 runFakeSsh (_host:cmd:[]) = do
-	let p = shell cmd
-	(_, _, _, pid) <- createProcess p
-	forceSuccessProcess p pid
+	(_, _, _, pid) <- createProcess (shell cmd)
+	exitWith =<< waitForProcess pid
 runFakeSsh ps = error $ "fake ssh option parse error: " ++ show ps
 
 getTestMode :: IO TestMode