2 files changed, 4 insertions, 7 deletions
diff --git a/activerecord/test/cases/connection_adapters/type/type_map_test.rb b/activerecord/test/cases/connection_adapters/type/type_map_test.rb
index 565f44eef8..300c2ed225 100644
--- a/activerecord/test/cases/connection_adapters/type/type_map_test.rb
+++ b/activerecord/test/cases/connection_adapters/type/type_map_test.rb
@@ -21,7 +21,7 @@ module ActiveRecord
 
         def test_overriding_registered_types
           time = Time.new
-          timestamp = Timestamp.new
+          timestamp = DateTime.new
           mapping = TypeMap.new
 
           mapping.register_type(/time/i, time)
@@ -51,7 +51,7 @@ module ActiveRecord
 
         def test_changing_type_changes_aliases
           time = Time.new
-          timestamp = Timestamp.new
+          timestamp = DateTime.new
           mapping = TypeMap.new
 
           mapping.register_type(/timestamp/i, time)
diff --git a/activerecord/test/cases/connection_adapters/type_lookup_test.rb b/activerecord/test/cases/connection_adapters/type_lookup_test.rb
index a5b01260d3..18df30faf5 100644
--- a/activerecord/test/cases/connection_adapters/type_lookup_test.rb
+++ b/activerecord/test/cases/connection_adapters/type_lookup_test.rb
@@ -45,14 +45,11 @@ module ActiveRecord
         assert_lookup_type :time, 'TIME'
       end
 
-      def test_timestamp_types
-        assert_lookup_type :timestamp, 'timestamp'
-        assert_lookup_type :timestamp, 'TIMESTAMP'
-      end
-
       def test_datetime_types
         assert_lookup_type :datetime, 'datetime'
         assert_lookup_type :datetime, 'DATETIME'
+        assert_lookup_type :datetime, 'timestamp'
+        assert_lookup_type :datetime, 'TIMESTAMP'
       end
 
       def test_decimal_types