10 files changed, 18 insertions, 18 deletions
diff --git a/actionpack/lib/action_dispatch/testing/assertions/routing.rb b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
index 496682e8bd..f1f998d932 100644
--- a/actionpack/lib/action_dispatch/testing/assertions/routing.rb
+++ b/actionpack/lib/action_dispatch/testing/assertions/routing.rb
@@ -211,7 +211,7 @@ module ActionDispatch
         def fail_on(exception_class)
           yield
         rescue exception_class => e
-          raise MiniTest::Assertion, e.message
+          raise Minitest::Assertion, e.message
         end
     end
   end
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index 9beb30307b..57ccb18452 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -137,7 +137,7 @@ module ActionDispatch
     class Session
       DEFAULT_HOST = "www.example.com"
 
-      include MiniTest::Assertions
+      include Minitest::Assertions
       include TestProcess, RequestHelpers, Assertions
 
       %w( status status_message headers body redirect? ).each do |method|
diff --git a/actionpack/test/assertions/response_assertions_test.rb b/actionpack/test/assertions/response_assertions_test.rb
index 8eec98e916..5e64cae7e2 100644
--- a/actionpack/test/assertions/response_assertions_test.rb
+++ b/actionpack/test/assertions/response_assertions_test.rb
@@ -19,7 +19,7 @@ module ActionDispatch
           @response = FakeResponse.new sym
           assert_response sym
 
-          assert_raises(MiniTest::Assertion) {
+          assert_raises(Minitest::Assertion) {
             assert_response :unauthorized
           }
         end
@@ -29,11 +29,11 @@ module ActionDispatch
         @response = FakeResponse.new 400
         assert_response 400
 
-        assert_raises(MiniTest::Assertion) {
+        assert_raises(Minitest::Assertion) {
           assert_response :unauthorized
         }
 
-        assert_raises(MiniTest::Assertion) {
+        assert_raises(Minitest::Assertion) {
           assert_response 500
         }
       end
@@ -42,11 +42,11 @@ module ActionDispatch
         @response = FakeResponse.new 401
         assert_response :unauthorized
 
-        assert_raises(MiniTest::Assertion) {
+        assert_raises(Minitest::Assertion) {
           assert_response :ok
         }
 
-        assert_raises(MiniTest::Assertion) {
+        assert_raises(Minitest::Assertion) {
           assert_response :success
         }
       end
diff --git a/activerecord/test/cases/migration/change_table_test.rb b/activerecord/test/cases/migration/change_table_test.rb
index 8065541bfe..c1d7cd5874 100644
--- a/activerecord/test/cases/migration/change_table_test.rb
+++ b/activerecord/test/cases/migration/change_table_test.rb
@@ -5,7 +5,7 @@ module ActiveRecord
   class Migration
     class TableTest < ActiveRecord::TestCase
       def setup
-        @connection = MiniTest::Mock.new
+        @connection = Minitest::Mock.new
       end
 
       def teardown
diff --git a/activesupport/test/deprecation_test.rb b/activesupport/test/deprecation_test.rb
index 9674851b9d..d118b0ddbf 100644
--- a/activesupport/test/deprecation_test.rb
+++ b/activesupport/test/deprecation_test.rb
@@ -174,7 +174,7 @@ class DeprecationTest < ActiveSupport::TestCase
       ActiveSupport::Deprecation.warn 'abc'
       ActiveSupport::Deprecation.warn 'def'
     end
-  rescue MiniTest::Assertion
+  rescue Minitest::Assertion
     flunk 'assert_deprecated should match any warning in block, not just the last one'
   end
 
diff --git a/activesupport/test/test_test.rb b/activesupport/test/test_test.rb
index 5ed2da7e8b..8a71ef4324 100644
--- a/activesupport/test/test_test.rb
+++ b/activesupport/test/test_test.rb
@@ -21,10 +21,10 @@ class AssertDifferenceTest < ActiveSupport::TestCase
     assert_equal true, assert_not(nil)
     assert_equal true, assert_not(false)
 
-    e = assert_raises(MiniTest::Assertion) { assert_not true }
+    e = assert_raises(Minitest::Assertion) { assert_not true }
     assert_equal 'Expected true to be nil or false', e.message
 
-    e = assert_raises(MiniTest::Assertion) { assert_not true, 'custom' }
+    e = assert_raises(Minitest::Assertion) { assert_not true, 'custom' }
     assert_equal 'custom', e.message
   end
 
@@ -73,7 +73,7 @@ class AssertDifferenceTest < ActiveSupport::TestCase
   end
 
   def test_array_of_expressions_identify_failure
-    assert_raises(MiniTest::Assertion) do
+    assert_raises(Minitest::Assertion) do
       assert_difference ['@object.num', '1 + 1'] do
         @object.increment
       end
@@ -81,7 +81,7 @@ class AssertDifferenceTest < ActiveSupport::TestCase
   end
 
   def test_array_of_expressions_identify_failure_when_message_provided
-    assert_raises(MiniTest::Assertion) do
+    assert_raises(Minitest::Assertion) do
       assert_difference ['@object.num', '1 + 1'], 1, 'something went wrong' do
         @object.increment
       end
diff --git a/guides/bug_report_templates/action_controller_gem.rb b/guides/bug_report_templates/action_controller_gem.rb
index 89ac28671a..e7a1e9bd87 100644
--- a/guides/bug_report_templates/action_controller_gem.rb
+++ b/guides/bug_report_templates/action_controller_gem.rb
@@ -29,7 +29,7 @@ end
 require 'minitest/autorun'
 require 'rack/test'
 
-class BugTest < MiniTest::Unit::TestCase
+class BugTest < Minitest::Unit::TestCase
   include Rack::Test::Methods
 
   def test_returns_success
diff --git a/guides/bug_report_templates/active_record_gem.rb b/guides/bug_report_templates/active_record_gem.rb
index a8868a1877..37cd700fbf 100644
--- a/guides/bug_report_templates/active_record_gem.rb
+++ b/guides/bug_report_templates/active_record_gem.rb
@@ -25,7 +25,7 @@ class Comment < ActiveRecord::Base
   belongs_to :post
 end
 
-class BugTest < MiniTest::Unit::TestCase
+class BugTest < Minitest::Unit::TestCase
   def test_association_stuff
     post = Post.create!
     post.comments << Comment.create!
diff --git a/railties/lib/rails/test_help.rb b/railties/lib/rails/test_help.rb
index be801befc2..7765c9ae86 100644
--- a/railties/lib/rails/test_help.rb
+++ b/railties/lib/rails/test_help.rb
@@ -11,7 +11,7 @@ require 'rails/generators/test_case'
 # Config Rails backtrace in tests.
 require 'rails/backtrace_cleaner'
 if ENV["BACKTRACE"].nil?
-  MiniTest.backtrace_filter = Rails.backtrace_cleaner
+  Minitest.backtrace_filter = Rails.backtrace_cleaner
 end
 
 if defined?(ActiveRecord::Base)
diff --git a/railties/test/configuration/middleware_stack_proxy_test.rb b/railties/test/configuration/middleware_stack_proxy_test.rb
index 2442cb995d..6f3e45f320 100644
--- a/railties/test/configuration/middleware_stack_proxy_test.rb
+++ b/railties/test/configuration/middleware_stack_proxy_test.rb
@@ -39,7 +39,7 @@ module Rails
         @stack.swap :foo
         @stack.delete :foo
 
-        mock = MiniTest::Mock.new
+        mock = Minitest::Mock.new
         mock.expect :send, nil, [:swap, :foo]
         mock.expect :send, nil, [:delete, :foo]
 
@@ -50,7 +50,7 @@ module Rails
       private
 
       def assert_playback(msg_name, args)
-        mock = MiniTest::Mock.new
+        mock = Minitest::Mock.new
         mock.expect :send, nil, [msg_name, args]
         @stack.merge_into(mock)
         mock.verify