diff --git a/tools/setup/generate-fixtures b/tools/setup/generate-fixtures
index 53fb98515b..da6b64adb3 100755
--- a/tools/setup/generate-fixtures
+++ b/tools/setup/generate-fixtures
@@ -26,7 +26,7 @@ EOF
 sh "$(dirname "$0")/../../scripts/setup/flush-memcached"
 
 ./manage.py migrate --noinput --settings=zproject.test_settings
-migration_status "var/migration-status"
+migration_status "var/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 --settings=zproject.test_settings --test-suite -n30 \
diff --git a/zerver/lib/test_fixtures.py b/zerver/lib/test_fixtures.py
index 64f2c72e63..4c910b2afd 100644
--- a/zerver/lib/test_fixtures.py
+++ b/zerver/lib/test_fixtures.py
@@ -95,7 +95,7 @@ def _check_hash(target_hash_file, status_dir):
 
 def is_template_database_current(
         database_name='zulip_test_template',
-        migration_status='var/migration-status',
+        migration_status='var/migration_status_test',
         settings='zproject.test_settings',
         status_dir='var/test_db_status',
         check_files=None):