diff --git a/nuclide/atom-test-runners/jasmine-runner.js b/nuclide/atom-test-runners/jasmine-runner.js
index 2ffac8c6..8430610d 100644
--- a/nuclide/atom-test-runners/jasmine-runner.js
+++ b/nuclide/atom-test-runners/jasmine-runner.js
@@ -1,11 +1,13 @@
 const { createRunner } = require("atom-jasmine3-test-runner")
 
+const fs = require("fs")
+
 // https://github.com/UziTech/atom-jasmine3-test-runner#api
 module.exports = createRunner({
   testPackages: process.env.APM_TEST_PACKAGES ? process.env.APM_TEST_PACKAGES.split(' ') : [],
-  suffix: "-test",
-  legacySuffix: "-test-v1",
-  testPaths: ["__tests__", "__atom_tests__"],
+  suffix: "-test-v3",
+  legacySuffix: "-test",
+  testPaths: ["__tests__", "__atom_tests__"].filter(dir => !fs.existsSync(process.cwd(), dir)),
   timeReporter: true,
   silentInstallation: true,
   // Extra Packages