diff --git a/lib/tasks/factory_girl.rake b/lib/tasks/factory_girl.rake
new file mode 100644
index 00000000..bccc1b66
--- /dev/null
+++ b/lib/tasks/factory_girl.rake
@@ -0,0 +1,15 @@
+namespace :factory_girl do
+  desc "Verify that all FactoryGirl factories are valid"
+  task lint: :environment do
+    if Rails.env.test?
+      begin
+        DatabaseCleaner.start
+        FactoryGirl.lint
+      ensure
+        DatabaseCleaner.clean
+      end
+    else
+      system("bundle exec rake factory_girl:lint RAILS_ENV='test'")
+    end
+  end
+end
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb
deleted file mode 100644
index 031f2a19..00000000
--- a/spec/support/factory_girl.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-RSpec.configure do |config|
-
-  config.before(:suite) do
-    FactoryGirl.lint
-  end
-
-end