diff --git a/tools/tests/modules.js b/tools/tests/modules.js
index c8b0ffb530..d6c0d679f4 100644
--- a/tools/tests/modules.js
+++ b/tools/tests/modules.js
@@ -34,7 +34,10 @@ selftest.define('modules - test app', async function() {
       '--once',
       '--full-app',
       '--driver-package',
-      'meteortesting:mocha'
+      // Not running with the --full-app option here, in order to exercise
+      // the normal `meteor test` behavior.
+      /// TODO: [Fibers] => turn this back to meteortesthing:mocha when 3.0.0 is released
+      "grubba:mocha" /// meteortesting:mocha"
     );
 
     run.waitSecs(60);