diff --git a/lib/tasks/search.rake b/lib/tasks/search.rake
index 93e51842d..5c7abd766 100644
--- a/lib/tasks/search.rake
+++ b/lib/tasks/search.rake
@@ -18,8 +18,9 @@ namespace :search do
 
     Search::Cluster.delete_indexes
   end
-
-  if %(development).include?(Rails.env)
-    Rake::Task["db:drop"].enhance(["search:destroy"])
-  end
+end
+
+if Rails.env.development?
+  Rake::Task["db:create"].enhance(["search:setup"])
+  Rake::Task["db:drop"].enhance(["search:destroy"])
 end