1 files changed, 3 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
index 2d1bc58020..3a9397bc26 100644
--- a/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/bit_string_test.rb
@@ -11,13 +11,14 @@ class PostgresqlBitStringTest < ActiveRecord::TestCase
 
   def setup
     @connection = ActiveRecord::Base.connection
-    @connection.create_table('postgresql_bit_strings') do |t|
+    @connection.create_table('postgresql_bit_strings', :force => true) do |t|
       t.bit :a_bit, default: "00000011", limit: 8
       t.bit_varying :a_bit_varying, default: "0011", limit: 4
     end
   end
 
-  teardown do
+  def teardown
+    return unless @connection
     @connection.execute 'DROP TABLE IF EXISTS postgresql_bit_strings'
   end