diff --git a/spec/support/db_cleaner.rb b/spec/support/db_cleaner.rb
index f2b3102..fa466ef 100644
--- a/spec/support/db_cleaner.rb
+++ b/spec/support/db_cleaner.rb
@@ -1,21 +1,18 @@
 RSpec.configure do |config|
-  config.around(:each) do
-    DatabaseCleaner.clean_with(:truncation)
-  end
 
-  config.around(:each) do
+  config.around(:each) do |example|
     DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.cleaning do
+      example.run
+    end
   end
 
-  config.around(:each, js: true) do
+  config.around(:each, js: true) do |example|
     DatabaseCleaner.strategy = :truncation
-  end
-
-  config.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  config.after(:each) do
-    DatabaseCleaner.clean
+    DatabaseCleaner.clean_with(:truncation)
+    DatabaseCleaner.cleaning do
+      example.run
+    end
   end
 end
--
libgit2 0.21.2