diff --git a/activesupport/lib/active_support/core_ext/string/indent.rb b/activesupport/lib/active_support/core_ext/string/indent.rb
index afc3032272..ce3a69cf5f 100644
--- a/activesupport/lib/active_support/core_ext/string/indent.rb
+++ b/activesupport/lib/active_support/core_ext/string/indent.rb
@@ -29,7 +29,7 @@ class String
   #   "foo\n\t\tbar".indent(2) # => "\t\tfoo\n\t\t\t\tbar"
   #   "foo".indent(2, "\t")    # => "\t\tfoo"
   #
-  # While +indent_string+ is tipically one space or tab, it may be any string.
+  # While +indent_string+ is typically one space or tab, it may be any string.
   #
   # The third argument, +indent_empty_lines+, is a flag that says whether
   # empty lines should be indented. Default is false.
diff --git a/activesupport/test/descendants_tracker_with_autoloading_test.rb b/activesupport/test/descendants_tracker_with_autoloading_test.rb
index ab1be296f8..a2ae066a21 100644
--- a/activesupport/test/descendants_tracker_with_autoloading_test.rb
+++ b/activesupport/test/descendants_tracker_with_autoloading_test.rb
@@ -6,7 +6,7 @@ require 'descendants_tracker_test_cases'
 class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
   include DescendantsTrackerTestCases
 
-  def test_clear_with_autoloaded_parent_children_and_granchildren
+  def test_clear_with_autoloaded_parent_children_and_grandchildren
     mark_as_autoloaded(*ALL) do
       ActiveSupport::DescendantsTracker.clear
       ALL.each do |k|
@@ -15,7 +15,7 @@ class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
     end
   end
 
-  def test_clear_with_autoloaded_children_and_granchildren
+  def test_clear_with_autoloaded_children_and_grandchildren
     mark_as_autoloaded Child1, Grandchild1, Grandchild2 do
       ActiveSupport::DescendantsTracker.clear
       assert_equal_sets [Child2], Parent.descendants
@@ -23,7 +23,7 @@ class DescendantsTrackerWithAutoloadingTest < ActiveSupport::TestCase
     end
   end
 
-  def test_clear_with_autoloaded_granchildren
+  def test_clear_with_autoloaded_grandchildren
     mark_as_autoloaded Grandchild1, Grandchild2 do
       ActiveSupport::DescendantsTracker.clear
       assert_equal_sets [Child1, Child2], Parent.descendants
diff --git a/activesupport/test/ordered_options_test.rb b/activesupport/test/ordered_options_test.rb
index f60f9a58e3..fdc745b23b 100644
--- a/activesupport/test/ordered_options_test.rb
+++ b/activesupport/test/ordered_options_test.rb
@@ -7,13 +7,13 @@ class OrderedOptionsTest < ActiveSupport::TestCase
 
     assert_nil a[:not_set]
 
-    a[:allow_concurreny] = true
+    a[:allow_concurrency] = true
     assert_equal 1, a.size
-    assert a[:allow_concurreny]
+    assert a[:allow_concurrency]
 
-    a[:allow_concurreny] = false
+    a[:allow_concurrency] = false
     assert_equal 1, a.size
-    assert !a[:allow_concurreny]
+    assert !a[:allow_concurrency]
 
     a["else_where"] = 56
     assert_equal 2, a.size
@@ -23,10 +23,10 @@ class OrderedOptionsTest < ActiveSupport::TestCase
   def test_looping
     a = ActiveSupport::OrderedOptions.new
 
-    a[:allow_concurreny] = true
+    a[:allow_concurrency] = true
     a["else_where"] = 56
 
-    test = [[:allow_concurreny, true], [:else_where, 56]]
+    test = [[:allow_concurrency, true], [:else_where, 56]]
 
     a.each_with_index do |(key, value), index|
       assert_equal test[index].first, key
@@ -39,13 +39,13 @@ class OrderedOptionsTest < ActiveSupport::TestCase
 
     assert_nil a.not_set
 
-    a.allow_concurreny = true
+    a.allow_concurrency = true
     assert_equal 1, a.size
-    assert a.allow_concurreny
+    assert a.allow_concurrency
 
-    a.allow_concurreny = false
+    a.allow_concurrency = false
     assert_equal 1, a.size
-    assert !a.allow_concurreny
+    assert !a.allow_concurrency
 
     a.else_where = 56
     assert_equal 2, a.size