diff --git a/app/assets/javascripts/discourse/ember-cli-build.js b/app/assets/javascripts/discourse/ember-cli-build.js
index e6a01988ad4..18b770d9775 100644
--- a/app/assets/javascripts/discourse/ember-cli-build.js
+++ b/app/assets/javascripts/discourse/ember-cli-build.js
@@ -71,13 +71,7 @@ module.exports = function (defaults) {
     });
 
     let tests = concat(appTestTrees, {
-      inputFiles: [
-        "**/tests/acceptance/*.js",
-        "**/tests/integration/*.js",
-        "**/tests/integration/**/*.js",
-        "**/tests/unit/*.js",
-        "**/tests/unit/**/*.js",
-      ],
+      inputFiles: ["**/tests/**/*-test.js"],
       headerFiles: ["vendor/ember-cli/tests-prefix.js"],
       footerFiles: ["vendor/ember-cli/app-config.js"],
       outputFile: "/assets/core-tests.js",