diff --git a/lib/autospec/qunit_runner.rb b/lib/autospec/qunit_runner.rb
index 37bc6d76e0..579e6834ce 100644
--- a/lib/autospec/qunit_runner.rb
+++ b/lib/autospec/qunit_runner.rb
@@ -16,9 +16,9 @@ module Autospec
     end
 
     # Discourse specific
-    watch(%r{^app/assets/javascripts/discourse/(.+)\.js.es6$}) { |m| "test/javascripts/#{m[1]}-test.js.es6" }
-    watch(%r{^app/assets/javascripts/admin/(.+)\.js.es6$})     { |m| "test/javascripts/admin/#{m[1]}-test.js.es6" }
-    watch(%r{^test/javascripts/.+\.js.es6$})
+    watch(%r{^app/assets/javascripts/discourse/(.+)\.js$}) { |m| "test/javascripts/#{m[1]}-test.js" }
+    watch(%r{^app/assets/javascripts/admin/(.+)\.js$})     { |m| "test/javascripts/admin/#{m[1]}-test.js" }
+    watch(%r{^test/javascripts/.+\.js$})
 
     RELOADERS = Set.new
     def self.reload(pattern)
@@ -33,7 +33,7 @@ module Autospec
     reload(%r{^test/javascripts/(helpers|mixins)/.+\.js(\.es6)?$})
     reload("test/javascripts/test_helper.js")
 
-    watch(%r{^plugins/.*/test/.+\.js.es6$})
+    watch(%r{^plugins/.*/test/.+\.js(\.es6)?$})
 
     require "socket"