diff --git a/bin/setup b/bin/setup
index c091585f6..c93d663e1 100755
--- a/bin/setup
+++ b/bin/setup
@@ -16,8 +16,14 @@ announce "Installing dependencies"
 gem install bundler --conservative
 bundle check || bundle install
 
-announce "Preparing database"
-rails db:prepare
+
+if [[ $* == *--reset* ]]; then
+  announce "Recreating database"
+  rails db:reset
+else
+  announce "Preparing database"
+  rails db:prepare
+fi
 
 announce "Removing old logs and tempfiles"
 rails log:clear tmp:clear
diff --git a/db/seeds.rb b/db/seeds.rb
index 4fbd6ed97..c383d043a 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,9 +1,2 @@
-# This file should ensure the existence of records required to run the application in every environment (production,
-# development, test). The code here should be idempotent so that it can be executed at any point in every environment.
-# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup).
-#
-# Example:
-#
-#   ["Action", "Comedy", "Drama", "Horror"].each do |genre_name|
-#     MovieGenre.find_or_create_by!(name: genre_name)
-#   end
+# Start from fixtures
+Rake.application["db:fixtures:load"].invoke