diff --git a/tests/lib/start-stop.js b/tests/lib/start-stop.js
index 895ae04f4ec1c039b32a590e8d0351084cf5acfd..b73aa2ea8f4951a1c615788e750259ab93bd7ece 100644
--- a/tests/lib/start-stop.js
+++ b/tests/lib/start-stop.js
@@ -47,14 +47,16 @@ function setupProc(proc) {
       }
       var tokenRegex = new RegExp('token=([A-Za-z0-9]+)$', 'm');
 
-      if (!sentReady && /^browserid.*127\.0\.0\.1:10002$/.test(x)) {
+      if (!sentReady && /^router.*127\.0\.0\.1:10002$/.test(x)) {
         exports.browserid.emit('ready');
         sentReady = true;
       } else if (m = tokenRegex.exec(x)) {
-        tokenStack.push(m[1]);
-        if (nextTokenFunction) {
-          nextTokenFunction(tokenStack.shift());
-          nextTokenFunction = undefined;
+        if (!(/forwarding request:/.test(x))) {
+          tokenStack.push(m[1]);
+          if (nextTokenFunction) {
+            nextTokenFunction(tokenStack.shift());
+            nextTokenFunction = undefined;
+          }
         }
       }
     });