diff --git a/tests/all.T b/tests/all.T
index 104e08de..ac380aef 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -48,6 +48,6 @@ test('process010', [
 test('process011',
      [when(opsys('mingw32'), skip), pre_cmd('{compiler} -no-hs-main -o process011_c process011_c.c'), js_broken(22349)],
      compile_and_run, [''])
-
+test('process-fork-wait', normal, compile_and_run, [''])
 test('T8343', js_broken(22349), compile_and_run, [''])
 test('processT251', js_broken(22349), compile_and_run, [''])
diff --git a/tests/process-fork-wait.hs b/tests/process-fork-wait.hs
new file mode 100644
index 00000000..9b916dab
--- /dev/null
+++ b/tests/process-fork-wait.hs
@@ -0,0 +1,42 @@
+-- | This test verifies that the 'use_process_jobs' feature works as
+-- advertised. Specifically: on Windows 'waitForProcess' should not return
+-- until all processes created by the child (including those created with
+-- @fork@) have exited if 'use_process_jobs' is enabled.
+--
+
+module Main where
+
+import Control.Concurrent
+import Control.Monad
+import System.Environment
+import System.IO
+import System.Process
+
+main :: IO ()
+main = do
+    args <- getArgs
+    run args
+
+run :: [String] -> IO ()
+run [] = do
+    putStrLn "starting A"
+    hFlush stdout
+    -- Disabling use_process_jobs here will cause waitForProcess to return
+    -- before the process B invocation has written the test file.
+    (_,_,_,p) <- createProcess $ (proc "process-fork-wait" ["A"]) { use_process_jobs = True }
+    void $ waitForProcess p
+    contents <- readFile "test"
+    when (contents /= "looks good to me")
+        $ fail "invalid file contents"
+run ["A"] = do
+    putStrLn "A started"
+    hFlush stdout
+    (_,_,_,_) <- createProcess $ (proc "process-fork-wait" ["B"])
+    return ()
+run ["B"] = do
+    putStrLn "B started"
+    hFlush stdout
+    threadDelay (5*1000*1000)
+    writeFile "test" "looks good to me"
+    putStrLn "B finished"
+run _ = fail "unknown mode"
diff --git a/tests/process-fork-wait.stdout b/tests/process-fork-wait.stdout
new file mode 100644
index 00000000..437a6306
--- /dev/null
+++ b/tests/process-fork-wait.stdout
@@ -0,0 +1,4 @@
+starting A
+A started
+B started
+B finished