diff --git a/tools/tests/login.js b/tools/tests/login.js
index 876eeffe7c..0e793bf3f5 100644
--- a/tools/tests/login.js
+++ b/tools/tests/login.js
@@ -19,6 +19,7 @@ selftest.define("login", ['net'], function () {
   // even if you are already logged in.
   for (var i = 0; i < 2; i++) {
     run = s.run("login");
+    run.waitSecs(commandTimeoutSecs);
     run.matchErr("Username:");
     run.write("test\n");
     run.matchErr("Password:");
@@ -31,6 +32,7 @@ selftest.define("login", ['net'], function () {
   // Leaving username blank, or getting the password wrong, doesn't
   // reprompt. It also doesn't log you out.
   run = s.run("login");
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("\n");
   run.matchErr("Password:");
@@ -40,6 +42,7 @@ selftest.define("login", ['net'], function () {
   run.expectExit(1);
 
   run = s.run("login");
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("test\n");
   run.matchErr("Password:");
@@ -49,6 +52,7 @@ selftest.define("login", ['net'], function () {
   run.expectExit(1);
 
   run = s.run('login');
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("test\n");
   run.matchErr("Password:");
@@ -80,6 +84,7 @@ selftest.define("login", ['net'], function () {
 
   // Test login failure
   run = s.run("login");
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("test\n");
   run.matchErr("Password:");
@@ -91,6 +96,7 @@ selftest.define("login", ['net'], function () {
   // Logging in with a capitalized username should work (usernames are
   // case-insensitive).
   run = s.run("login");
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("TeSt\n");
   run.matchErr("Password:");
@@ -107,6 +113,7 @@ selftest.define("login", ['net'], function () {
   // Logging in with a capitalized password should NOT work (can't be
   // too safe...)
   run = s.run("login");
+  run.waitSecs(commandTimeoutSecs);
   run.matchErr("Username:");
   run.write("test\n");
   run.matchErr("Password:");
diff --git a/tools/tests/run.js b/tools/tests/run.js
index 80e4544544..cc114a024e 100644
--- a/tools/tests/run.js
+++ b/tools/tests/run.js
@@ -180,7 +180,7 @@ selftest.define("run --once", function () {
   s.cd("onceapp");
   s.set("RUN_ONCE_OUTCOME", "mongo");
   run = s.run("--once");
-  run.waitSecs(15);
+  run.waitSecs(30);
   run.expectExit(86);
 });
 
@@ -199,7 +199,7 @@ selftest.define("run errors", function () {
 
   var run = s.run("-p", proxyPort);
   _.times(3, function () {
-    run.waitSecs(3);
+    run.waitSecs(30);
     run.match("Unexpected mongo exit code 48. Restarting.");
   });
   run.waitSecs(3);