diff --git a/features/support/env.rb b/features/support/env.rb
index 25821c1e6..ffb1c2189 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -42,12 +42,11 @@ Cucumber::Rails::World.use_transactional_fixtures = true
 require File.join(File.dirname(__FILE__), "..", "..", "spec", "helper_methods")
 include HelperMethods
 
-Before do
-  DatabaseCleaner.start
-end
+DatabaseCleaner.start
 
-After do
+Before do
   DatabaseCleaner.clean
+  DatabaseCleaner.start
 end
 
 module Resque