diff --git a/tools/rebuild-test-database b/tools/rebuild-test-database
index ea86a09b2e..916df56bfe 100755
--- a/tools/rebuild-test-database
+++ b/tools/rebuild-test-database
@@ -2,5 +2,37 @@
 set -e
 set -x
 
-# This is a really simple wrapper script, pretty much for documenting clarity
-"$(dirname "$0")/../tools/setup/generate-fixtures" --force
+export DJANGO_SETTINGS_MODULE=zproject.test_settings
+
+create_template_database()
+{
+    psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
+DROP DATABASE IF EXISTS zulip_test_template;
+CREATE DATABASE zulip_test_template TEMPLATE zulip_test;
+EOF
+}
+
+mkdir -p zerver/tests/fixtures
+
+"$(dirname "$0")/../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
+
+psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test <<EOF
+DROP DATABASE IF EXISTS zulip_test;
+CREATE DATABASE zulip_test TEMPLATE zulip_test_base;
+EOF
+"$(dirname "$0")/../scripts/setup/flush-memcached"
+
+./manage.py migrate --noinput
+./manage.py get_migration_status --output="migration_status_test"
+
+# This next line can be simplified to "-n0" once we fix our app (and tests) with 0 messages.
+./manage.py populate_db --test-suite -n30 --threads=1 \
+    --huddles=0 --personals=0 --percent-huddles=0 --percent-personals=0
+./manage.py dumpdata \
+    zerver.UserProfile zerver.Stream zerver.Recipient \
+    zerver.Subscription zerver.Message zerver.Huddle zerver.Realm \
+    zerver.UserMessage zerver.Client \
+    zerver.DefaultStream > zerver/tests/fixtures/messages.json
+
+# create pristine template database, for fast fixture restoration after tests are run.
+create_template_database
diff --git a/tools/setup/generate-fixtures b/tools/setup/generate-fixtures
index 37c11ef8ba..b77aec85ac 100755
--- a/tools/setup/generate-fixtures
+++ b/tools/setup/generate-fixtures
@@ -1,47 +1,14 @@
 #!/usr/bin/env bash
 set -e
 
-export DJANGO_SETTINGS_MODULE=zproject.test_settings
-
-create_template_database()
+run()
 {
-    psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
-DROP DATABASE IF EXISTS zulip_test_template;
-CREATE DATABASE zulip_test_template TEMPLATE zulip_test;
-EOF
-}
-
-if  [ "$1" != "--force" ]; then
     "$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
     psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test << EOF
 DROP DATABASE IF EXISTS zulip_test;
 CREATE DATABASE zulip_test TEMPLATE zulip_test_template;
 EOF
     "$(dirname "$0")/../../scripts/setup/flush-memcached"
-    exit 0
-fi
+}
 
-mkdir -p zerver/tests/fixtures
-
-"$(dirname "$0")/../../scripts/setup/terminate-psql-sessions" zulip zulip_test zulip_test_base zulip_test_template
-
-psql -v ON_ERROR_STOP=1 -h localhost postgres zulip_test <<EOF
-DROP DATABASE IF EXISTS zulip_test;
-CREATE DATABASE zulip_test TEMPLATE zulip_test_base;
-EOF
-"$(dirname "$0")/../../scripts/setup/flush-memcached"
-
-./manage.py migrate --noinput
-./manage.py get_migration_status --output="migration_status_test"
-
-# This next line can be simplified to "-n0" once we fix our app (and tests) with 0 messages.
-./manage.py populate_db --test-suite -n30 --threads=1 \
-    --huddles=0 --personals=0 --percent-huddles=0 --percent-personals=0
-./manage.py dumpdata \
-    zerver.UserProfile zerver.Stream zerver.Recipient \
-    zerver.Subscription zerver.Message zerver.Huddle zerver.Realm \
-    zerver.UserMessage zerver.Client \
-    zerver.DefaultStream > zerver/tests/fixtures/messages.json
-
-# create pristine template database, for fast fixture restoration after tests are run.
-create_template_database
+run