diff --git a/tools/do-destroy-rebuild-test-database b/tools/do-destroy-rebuild-test-database
index a8a3e3cceb..bd769764fd 100755
--- a/tools/do-destroy-rebuild-test-database
+++ b/tools/do-destroy-rebuild-test-database
@@ -1,5 +1,5 @@
 #!/bin/sh -xe
 
 # This is a really simple wrapper script, pretty much for documenting clarity
-`dirname $0`/../zerver/tests/generate-fixtures --force
+`dirname $0`/../tools/generate-fixtures --force
 
diff --git a/zerver/tests/generate-fixtures b/tools/generate-fixtures
similarity index 100%
rename from zerver/tests/generate-fixtures
rename to tools/generate-fixtures
diff --git a/tools/test-backend b/tools/test-backend
index 6996908d0e..8686709450 100755
--- a/tools/test-backend
+++ b/tools/test-backend
@@ -10,7 +10,7 @@ case "$1" in
 esac
 
 cd "$(dirname "$0")"/..
-./zerver/tests/generate-fixtures
+./tools/generate-fixtures
 # "-u" uses unbuffered IO, which is important when wrapping it in
 # something like subprocess (as tools/review does)
 /usr/bin/env python -u ./manage.py test "$target" --settings=zproject.test_settings "$@"
diff --git a/zerver/tests/frontend/run b/zerver/tests/frontend/run
index 1e0fe0b533..c60a5f5af3 100755
--- a/zerver/tests/frontend/run
+++ b/zerver/tests/frontend/run
@@ -36,7 +36,7 @@ for file in args:
 
 os.chdir(path.join(path.dirname(__file__), '../../..'))
 
-subprocess.check_call('zerver/tests/generate-fixtures')
+subprocess.check_call('tools/generate-fixtures')
 
 subprocess.check_call(['rm', '-f'] + glob.glob('/tmp/casper-failure*.png'))