diff --git a/tools/tests/update-tests.js b/tools/tests/update-tests.js
index 035246d3d9..3da4f8bfe0 100644
--- a/tools/tests/update-tests.js
+++ b/tools/tests/update-tests.js
@@ -35,7 +35,8 @@ selftest.define("'meteor update' alters constraints in `.meteor/packages`", () =
   });
 
   s.createApp("myapp", "very-simple-app-with-no-package-constraints", {
-    release: DEFAULT_RELEASE_TRACK + '@v1'
+    release: DEFAULT_RELEASE_TRACK + '@v1',
+    timeout: 300,
   });
   s.cd("myapp");
 
diff --git a/tools/tool-testing/sandbox.js b/tools/tool-testing/sandbox.js
index 03bd27d317..86ab0b9f4d 100644
--- a/tools/tool-testing/sandbox.js
+++ b/tools/tool-testing/sandbox.js
@@ -83,7 +83,7 @@ export default class Sandbox {
       this.warehouse = files.pathJoin(this.root, 'tropohouse');
       this._makeWarehouse(this.options.warehouse);
     }
-    
+
     const meteorScript = process.platform === "win32" ? "meteor.bat" : "meteor";
 
     // Figure out the 'meteor' to run
@@ -211,7 +211,7 @@ export default class Sandbox {
       // multiple calls to createApp with the same template get the same cache?
       // This is a little tricky because isopack-buildinfo.json uses absolute
       // paths.
-      run.waitSecs(120);
+      run.waitSecs(options.timeout || 120);
       run.expectExit(0);
     });
   }