diff --git a/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java b/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
index 4743204c2aa..04c42935ffa 100644
--- a/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
+++ b/mozilla/js/rhino/testsrc/org/mozilla/javascript/drivers/ShellTest.java
@@ -300,14 +300,15 @@ class ShellTest {
                 }
             }
         }, jsFile.getPath());
+        t.setDaemon(true);
         t.start();
         t.join(parameters.getTimeoutMilliseconds());
         synchronized(testState)
         {
             if(!testState.finished)
             {
-                status.timedOut();
                 t.stop();
+                status.timedOut();
             }
         }
         int expectedExitCode = 0;