diff --git a/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js b/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js
deleted file mode 100644
index caccb2d83d..0000000000
--- a/app/assets/javascripts/discourse/tests/theme_qunit_ember_jquery.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// discourse-skip-module
-
-//= require env
-//= require jquery.debug
-//= require ember.debug
-//= require discourse-loader
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index d001928faa..6d8299ab66 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -1,3 +1,5 @@
+//= require ember_jquery
+
 //= require logster
 
 //= require template_include.js
diff --git a/app/assets/javascripts/wizard-vendor.js b/app/assets/javascripts/wizard-vendor.js
index 9122a4568f..1c515750de 100644
--- a/app/assets/javascripts/wizard-vendor.js
+++ b/app/assets/javascripts/wizard-vendor.js
@@ -1,3 +1,4 @@
+//= require ember_jquery
 //= require template_include.js
 //= require jquery.ui.widget.js
 //= require jquery.fileupload.js
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 8677c9dd16..85d6e916ff 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -709,6 +709,7 @@ class UsersController < ApplicationController
   def password_reset_show
     expires_now
     token = params[:token]
+
     password_reset_find_user(token, committing_change: false)
 
     if !@error
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 7c6f82014b..4bb2d4c7f6 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -28,7 +28,6 @@
     <%- if ExtraLocalesController.client_overrides_exist? %>
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
     <%- end %>
-    <%= preload_script "ember_jquery" %>
     <%= preload_script "vendor" %>
     <%= preload_script "pretty-text-bundle" %>
     <%= preload_script "application" %>
diff --git a/app/views/qunit/theme.html.erb b/app/views/qunit/theme.html.erb
index 9da3ac49d1..5815441cec 100644
--- a/app/views/qunit/theme.html.erb
+++ b/app/views/qunit/theme.html.erb
@@ -7,7 +7,6 @@
       <%= discourse_stylesheet_link_tag(:desktop, theme_ids: nil) %>
       <%= discourse_stylesheet_link_tag(:test_helper, theme_ids: nil) %>
       <%= preload_script "locales/en" %>
-      <%= preload_script "discourse/tests/theme_qunit_ember_jquery" %>
       <%= preload_script "vendor" %>
       <%= preload_script "discourse/tests/theme_qunit_vendor" %>
       <%= preload_script "pretty-text-bundle" %>
diff --git a/app/views/users/activate_account.html.erb b/app/views/users/activate_account.html.erb
index 18a6220283..790df1011c 100644
--- a/app/views/users/activate_account.html.erb
+++ b/app/views/users/activate_account.html.erb
@@ -10,7 +10,6 @@
 </div>
 
 <%- content_for(:no_ember_head) do %>
-  <%= preload_script "ember_jquery" %>
   <%= preload_script "vendor" %>
   <%= render_google_universal_analytics_code %>
   <%= tag.meta id: 'data-activate-account', data: { path: path('/session/hp') } %>
diff --git a/app/views/wizard/index.html.erb b/app/views/wizard/index.html.erb
index 7b828df909..5765863cfa 100644
--- a/app/views/wizard/index.html.erb
+++ b/app/views/wizard/index.html.erb
@@ -6,7 +6,6 @@
     <%- if ExtraLocalesController.client_overrides_exist? %>
       <%= preload_script_url ExtraLocalesController.url('overrides') %>
     <%- end %>
-    <%= preload_script 'ember_jquery' %>
     <%= preload_script 'wizard-vendor' %>
     <%= preload_script 'wizard-application' %>
     <%= preload_script_url ExtraLocalesController.url('wizard') %>
diff --git a/config/application.rb b/config/application.rb
index 5f61cbbef5..f3a47a481a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -175,7 +175,6 @@ module Discourse
       embed-application.js
       discourse/tests/theme_qunit_helper.js
       discourse/tests/theme_qunit_vendor.js
-      discourse/tests/theme_qunit_ember_jquery.js
       discourse/tests/test_starter.js
     }
 
diff --git a/spec/requests/qunit_controller_spec.rb b/spec/requests/qunit_controller_spec.rb
index a72b693f74..c8526962be 100644
--- a/spec/requests/qunit_controller_spec.rb
+++ b/spec/requests/qunit_controller_spec.rb
@@ -98,7 +98,6 @@ describe QunitController do
         expect(response.body).to include("/stylesheets/desktop_")
         expect(response.body).to include("/stylesheets/test_helper_")
         expect(response.body).to include("/assets/locales/en.js")
-        expect(response.body).to include("/assets/discourse/tests/theme_qunit_ember_jquery.js")
         expect(response.body).to include("/assets/vendor.js")
         expect(response.body).to include("/assets/discourse/tests/theme_qunit_vendor.js")
         expect(response.body).to include("/assets/pretty-text-bundle.js")