diff --git a/test/form_builder/general_test.rb b/test/form_builder/general_test.rb
index 223732ac..2f780719 100644
--- a/test/form_builder/general_test.rb
+++ b/test/form_builder/general_test.rb
@@ -158,22 +158,22 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should generate date select for date columns' do
     with_form_for @user, :born_at
-    assert_select 'form select#user_born_at_1i.date'
+    assert_select 'form input#user_born_at.date'
   end
 
   test 'builder should generate time select for time columns' do
     with_form_for @user, :delivery_time
-    assert_select 'form select#user_delivery_time_4i.time'
+    assert_select 'form input#user_delivery_time.time'
   end
 
   test 'builder should generate datetime select for datetime columns' do
     with_form_for @user, :created_at
-    assert_select 'form select#user_created_at_1i.datetime'
+    assert_select 'form input#user_created_at.datetime'
   end
 
   test 'builder should generate datetime select for timestamp columns' do
     with_form_for @user, :updated_at
-    assert_select 'form select#user_updated_at_1i.datetime'
+    assert_select 'form input#user_updated_at.datetime'
   end
 
   test 'builder should generate file for file columns' do
@@ -406,7 +406,7 @@ class FormBuilderTest < ActionView::TestCase
 
   test 'builder should allow overriding input type when object is not present' do
     with_form_for :project, :created_at, as: :datetime
-    assert_select 'form select.datetime#project_created_at_1i'
+    assert_select 'form input.datetime#project_created_at'
     with_form_for :project, :budget, as: :decimal
     assert_select 'form input.decimal#project_budget'
   end
diff --git a/test/inputs/disabled_test.rb b/test/inputs/disabled_test.rb
index fef3cd36..9db6424b 100644
--- a/test/inputs/disabled_test.rb
+++ b/test/inputs/disabled_test.rb
@@ -18,12 +18,12 @@ class DisabledTest < ActionView::TestCase
 
   test 'date input should be disabled when disabled option is true' do
     with_input_for @user, :born_at, :date, disabled: true
-    assert_select 'select.date.disabled[disabled]'
+    assert_select 'input.date.disabled[disabled]'
   end
 
   test 'datetime input should be disabled when disabled option is true' do
     with_input_for @user, :created_at, :datetime, disabled: true
-    assert_select 'select.datetime.disabled[disabled]'
+    assert_select 'input.datetime.disabled[disabled]'
   end
 
   test 'string input should not be disabled when disabled option is false' do
diff --git a/test/inputs/general_test.rb b/test/inputs/general_test.rb
index 5b3e3da8..e21a9e1c 100644
--- a/test/inputs/general_test.rb
+++ b/test/inputs/general_test.rb
@@ -10,9 +10,9 @@ class InputTest < ActionView::TestCase
     with_input_for @user, :age, :integer
     assert_select 'input.integer'
     with_input_for @user, :born_at, :date
-    assert_select 'select.date'
+    assert_select 'input.date'
     with_input_for @user, :created_at, :datetime
-    assert_select 'select.datetime'
+    assert_select 'input.datetime'
   end
 
   test 'string input should generate autofocus attribute when autofocus option is true' do
@@ -48,12 +48,12 @@ class InputTest < ActionView::TestCase
 
   test 'date input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :born_at, :date, autofocus: true
-    assert_select 'select.date[autofocus]'
+    assert_select 'input.date[autofocus]'
   end
 
   test 'datetime input should generate autofocus attribute when autofocus option is true' do
     with_input_for @user, :created_at, :datetime, autofocus: true
-    assert_select 'select.datetime[autofocus]'
+    assert_select 'input.datetime[autofocus]'
   end
 
   test 'string input should generate autofocus attribute when autofocus option is false' do
diff --git a/test/inputs/readonly_test.rb b/test/inputs/readonly_test.rb
index c6f4070a..c99ecc13 100644
--- a/test/inputs/readonly_test.rb
+++ b/test/inputs/readonly_test.rb
@@ -18,12 +18,12 @@ class ReadonlyTest < ActionView::TestCase
 
   test 'date input should generate readonly elements when readonly option is true' do
     with_input_for @user, :born_at, :date, readonly: true
-    assert_select 'select.date.readonly[readonly]'
+    assert_select 'input.date.readonly[readonly]'
   end
 
   test 'datetime input should generate readonly elements when readonly option is true' do
     with_input_for @user, :created_at, :datetime, readonly: true
-    assert_select 'select.datetime.readonly[readonly]'
+    assert_select 'input.datetime.readonly[readonly]'
   end
 
   test 'string input should generate readonly elements when readonly option is false' do