diff --git a/actionpack/lib/action_controller/testing/integration.rb b/actionpack/lib/action_controller/testing/integration.rb
index f960698566d8fff997bea2958b0fdea935fa4695..7fa1fd93bf8b904f892fa4e3ddbc0cf6fd726890 100644
--- a/actionpack/lib/action_controller/testing/integration.rb
+++ b/actionpack/lib/action_controller/testing/integration.rb
@@ -14,7 +14,7 @@ module Integration #:nodoc:
     # Integration::Session directly.
     class Session
       include Test::Unit::Assertions
-      include ActionController::TestCase::Assertions
+      include ActionDispatch::Assertions
       include ActionController::TestProcess
 
       # The integer HTTP status code of the last request.
diff --git a/actionpack/lib/action_controller/testing/test_case.rb b/actionpack/lib/action_controller/testing/test_case.rb
index a80488e13ed9760cba62026e341d8a19c56d8018..7b4eda58e50b058b65e5840c73619332a0861bca 100644
--- a/actionpack/lib/action_controller/testing/test_case.rb
+++ b/actionpack/lib/action_controller/testing/test_case.rb
@@ -105,12 +105,7 @@ module ActionController
   class TestCase < ActiveSupport::TestCase
     include TestProcess
 
-    module Assertions
-      %w(response selector tag dom routing model).each do |kind|
-        include ActionController::Assertions.const_get("#{kind.camelize}Assertions")
-      end
-    end
-    include Assertions
+    include ActionDispatch::Assertions
 
     # When the request.remote_addr remains the default for testing, which is 0.0.0.0, the exception is simply raised inline
     # (bystepping the regular exception handling from rescue_action). If the request.remote_addr is anything else, the regular
diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
index 4f65dcadeec0b965f948f134b452059d1bc90f43..8b8a1774e4ab4004eb3d8a3ca0346068b50d2a3a 100644
--- a/actionpack/lib/action_dispatch.rb
+++ b/actionpack/lib/action_dispatch.rb
@@ -45,6 +45,8 @@ module ActionDispatch
   autoload :Reloader, 'action_dispatch/middleware/reloader'
   autoload :MiddlewareStack, 'action_dispatch/middleware/stack'
 
+  autoload :Assertions, 'action_dispatch/testing/assertions'
+
   module Http
     autoload :Headers, 'action_dispatch/http/headers'
   end
diff --git a/actionpack/lib/action_dispatch/testing/assertions.rb b/actionpack/lib/action_dispatch/testing/assertions.rb
new file mode 100644
index 0000000000000000000000000000000000000000..96f08f23550d868a53ae0778f57ab2ba1ed53035
--- /dev/null
+++ b/actionpack/lib/action_dispatch/testing/assertions.rb
@@ -0,0 +1,8 @@
+module ActionDispatch
+  module Assertions
+    %w(response selector tag dom routing model).each do |kind|
+      require "action_dispatch/testing/assertions/#{kind}"
+      include const_get("#{kind.camelize}Assertions")
+    end
+  end
+end
diff --git a/actionpack/lib/action_controller/testing/assertions/dom.rb b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
similarity index 98%
rename from actionpack/lib/action_controller/testing/assertions/dom.rb
rename to actionpack/lib/action_dispatch/testing/assertions/dom.rb
index c0e6c68fcd90b7743e4dd943e020939c636d5d04..9a917f704ae1bc0431bf32adafa5f59dae6872a4 100644
--- a/actionpack/lib/action_controller/testing/assertions/dom.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/dom.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     module DomAssertions
       # Test two HTML strings for equivalency (e.g., identical up to reordering of attributes)
diff --git a/actionpack/lib/action_controller/testing/assertions/model.rb b/actionpack/lib/action_dispatch/testing/assertions/model.rb
similarity index 96%
rename from actionpack/lib/action_controller/testing/assertions/model.rb
rename to actionpack/lib/action_dispatch/testing/assertions/model.rb
index 93e3bcf4562863825531ec5cbfb1b39477e81748..46714418c6f3c2d8f5cf217030c04f3ed6684481 100644
--- a/actionpack/lib/action_controller/testing/assertions/model.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/model.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     module ModelAssertions
       # Ensures that the passed record is valid by Active Record standards and
diff --git a/actionpack/lib/action_controller/testing/assertions/response.rb b/actionpack/lib/action_dispatch/testing/assertions/response.rb
similarity index 99%
rename from actionpack/lib/action_controller/testing/assertions/response.rb
rename to actionpack/lib/action_dispatch/testing/assertions/response.rb
index 7b2936e26ce3c57ce9afeb4775e78da8b409ae23..a72ce9084fa745cc49740f69d59289b6c9bb522c 100644
--- a/actionpack/lib/action_controller/testing/assertions/response.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/response.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # A small suite of assertions that test responses from Rails applications.
     module ResponseAssertions
diff --git a/actionpack/lib/action_controller/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
similarity index 99%
rename from actionpack/lib/action_controller/testing/assertions/routing.rb
rename to actionpack/lib/action_dispatch/testing/assertions/routing.rb
index f3f4f54fe31a35156c27780b40d65858b0df2595..89d1a49403f4dfb8ae238d0e929e5dcd3954a0ce 100644
--- a/actionpack/lib/action_controller/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # Suite of assertions to test routes generated by Rails and the handling of requests made to them.
     module RoutingAssertions
diff --git a/actionpack/lib/action_controller/testing/assertions/selector.rb b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
similarity index 99%
rename from actionpack/lib/action_controller/testing/assertions/selector.rb
rename to actionpack/lib/action_dispatch/testing/assertions/selector.rb
index 0d56ea5ef7828955d9e582c7805391ccaf3971f7..dd75cda6b9c5bcc5942b834d0d189b6de44e4e3d 100644
--- a/actionpack/lib/action_controller/testing/assertions/selector.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/selector.rb
@@ -3,7 +3,7 @@
 # Under MIT and/or CC By license.
 #++
 
-module ActionController
+module ActionDispatch
   module Assertions
     unless const_defined?(:NO_STRIP)
       NO_STRIP = %w{pre script style textarea}
diff --git a/actionpack/lib/action_controller/testing/assertions/tag.rb b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
similarity index 99%
rename from actionpack/lib/action_controller/testing/assertions/tag.rb
rename to actionpack/lib/action_dispatch/testing/assertions/tag.rb
index d9197b7855bd0ff50d0faf18c598c51d2359473f..ef6867576e52e1a819700fed8d83f62c82c9e6ee 100644
--- a/actionpack/lib/action_controller/testing/assertions/tag.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/tag.rb
@@ -1,4 +1,4 @@
-module ActionController
+module ActionDispatch
   module Assertions
     # Pair of assertions to testing elements in the HTML output of the response.
     module TagAssertions
diff --git a/actionpack/lib/action_view/test_case.rb b/actionpack/lib/action_view/test_case.rb
index 50bed67f7d6b6147e0e40d8b9d03f2902ac6175e..22adf97304571b7d37af7470ccb6544cbfca0bf3 100644
--- a/actionpack/lib/action_view/test_case.rb
+++ b/actionpack/lib/action_view/test_case.rb
@@ -21,7 +21,7 @@ def _render_template(template, local_assigns = {})
   end
 
   class TestCase < ActiveSupport::TestCase
-    include ActionController::TestCase::Assertions
+    include ActionDispatch::Assertions
     include ActionController::TestProcess
 
     class_inheritable_accessor :helper_class