diff --git a/tools/tests/run.js b/tools/tests/run.js
index e329512278..e9cf8ec9cb 100644
--- a/tools/tests/run.js
+++ b/tools/tests/run.js
@@ -174,16 +174,14 @@ selftest.define("run --once", ["yet-unsolved-windows-failure"], function () {
   run.forbidAll("updated");
   s.unlink('empty.js');
   s.write('.meteor/release', originalRelease);
+});
 
-  // Wait for Mongo to exit after Meteor exits.
-  utils.sleepMs(2000);
-
-  // Try it with a real Mongo. Make sure that it actually starts one.
-  s = new Sandbox;
+selftest.define("run --once with real Mongo", function () {
+  var s = new Sandbox;
   s.createApp("onceapp", "once");
   s.cd("onceapp");
   s.set("RUN_ONCE_OUTCOME", "mongo");
-  run = s.run("--once");
+  var run = s.run("--once");
   run.waitSecs(30);
   run.expectExit(86);
 });