diff --git a/package-lock.json b/package-lock.json
index b343bec0a..55216e2e2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5292,6 +5292,12 @@
         "is-glob": "2.0.1"
       }
     },
+    "glob-promise": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/glob-promise/-/glob-promise-3.3.0.tgz",
+      "integrity": "sha512-X5VIEO/yy5NH3p9ORhlNodakQo/cK4I0lCtARNeAkWueJiToew5Xs9DiukVKsW5dgpjnnQgou9Rbj3HUkM6OUw==",
+      "dev": true
+    },
     "glob-stream": {
       "version": "5.3.5",
       "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz",
diff --git a/package.json b/package.json
index 518fecba4..c23de7462 100644
--- a/package.json
+++ b/package.json
@@ -101,6 +101,8 @@
     "favicons-webpack-plugin": "0.0.7",
     "file-loader": "^1.1.5",
     "friendly-errors-webpack-plugin": "^1.6.1",
+    "glob": "^7.1.2",
+    "glob-promise": "^3.3.0",
     "html-webpack-plugin": "^2.29.0",
     "http-proxy": "^1.16.2",
     "imports-loader": "^0.7.1",
diff --git a/tests/e2e/findStuff.js b/tests/e2e/findStuff.e2e.js
similarity index 100%
rename from tests/e2e/findStuff.js
rename to tests/e2e/findStuff.e2e.js
diff --git a/tests/e2e/run.js b/tests/e2e/run.js
index 5e067e336..c4ece0792 100644
--- a/tests/e2e/run.js
+++ b/tests/e2e/run.js
@@ -1,5 +1,6 @@
 const createTestCafe = require('testcafe')
 const { join } = require('path')
+const glob = require('glob-promise');
 
 const isCI = process.argv.includes('--ci')
 const browsers = isCI ? ['chrome:headless'] : ['chromium'];
@@ -8,8 +9,7 @@ const browsers = isCI ? ['chrome:headless'] : ['chromium'];
   const testcafe = await createTestCafe('localhost')
   const runner = await testcafe.createRunner()
   const failedCount = await runner
-    // should pass in test files via args or use some autodiscovery
-    .src(join(__dirname, 'findStuff.js'))
+    .src(await glob(join(__dirname, '**/*.e2e.js')))
     .browsers(browsers)
     .screenshots('e2e-screenshots')
     .run({