diff --git a/actionview/test/template/form_options_helper_test.rb b/actionview/test/template/form_options_helper_test.rb
index 50e9d132a7..fbafb7aa08 100644
--- a/actionview/test/template/form_options_helper_test.rb
+++ b/actionview/test/template/form_options_helper_test.rb
@@ -119,6 +119,26 @@ def test_array_options_for_select
     )
   end
 
+  def test_array_options_for_select_with_custom_defined_selected
+    assert_dom_equal(
+      "<option selected=\"selected\" type=\"Coach\" value=\"1\">Richard Bandler</option>\n<option type=\"Coachee\" value=\"1\">Richard Bandler</option>",
+      options_for_select([
+        ['Richard Bandler', 1, { type: 'Coach', selected: 'selected' }],
+        ['Richard Bandler', 1, { type: 'Coachee' }]
+      ])
+    )
+  end
+
+  def test_array_options_for_select_with_custom_defined_disabled
+    assert_dom_equal(
+      "<option disabled=\"disabled\" type=\"Coach\" value=\"1\">Richard Bandler</option>\n<option type=\"Coachee\" value=\"1\">Richard Bandler</option>",
+      options_for_select([
+        ['Richard Bandler', 1, { type: 'Coach', disabled: 'disabled' }],
+        ['Richard Bandler', 1, { type: 'Coachee' }]
+      ])
+    )
+  end
+
   def test_array_options_for_select_with_selection
     assert_dom_equal(
       "<option value=\"Denmark\">Denmark</option>\n<option value=\"&lt;USA&gt;\" selected=\"selected\">&lt;USA&gt;</option>\n<option value=\"Sweden\">Sweden</option>",
@@ -813,7 +833,7 @@ def test_select_with_prompt_and_selected_value
       select("post", "category", %w( one two ), :selected => 'two', :prompt => true)
     )
   end
-  
+
   def test_select_with_disabled_array
     @post = Post.new
     @post.category = "<mus>"