diff --git a/README.dev.md b/README.dev.md
index 3c1dc693b1..c0829846c7 100644
--- a/README.dev.md
+++ b/README.dev.md
@@ -330,7 +330,7 @@ Finally continue with the All Systems instructions below.
 
 ```
 pip install --no-deps -r requirements.txt
-./tools/install-phantomjs
+./tools/setup/install-phantomjs
 ./tools/install-mypy
 ./tools/setup/download-zxcvbn
 ./tools/emoji_dump/build_emoji
diff --git a/provision.py b/provision.py
index c2b6105f91..2c2784a76c 100644
--- a/provision.py
+++ b/provision.py
@@ -164,9 +164,9 @@ def main():
     os.chdir(ZULIP_PATH)
 
     if "--travis" in sys.argv:
-        run(["tools/install-phantomjs", "--travis"])
+        run(["tools/setup/install-phantomjs", "--travis"])
     else:
-        run(["tools/install-phantomjs"])
+        run(["tools/setup/install-phantomjs"])
     run(["tools/setup/download-zxcvbn"])
     run(["tools/setup/emoji_dump/build_emoji"])
     run(["scripts/setup/generate_secrets.py", "-d"])
diff --git a/tools/install-phantomjs b/tools/setup/install-phantomjs
similarity index 94%
rename from tools/install-phantomjs
rename to tools/setup/install-phantomjs
index 4552480ae8..d07bc5add3 100755
--- a/tools/install-phantomjs
+++ b/tools/setup/install-phantomjs
@@ -5,7 +5,7 @@ import sys
 import platform
 import subprocess
 
-sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..'))
 from zulip_tools import run
 
 if platform.architecture()[0] == '64bit':
diff --git a/setup/postgres-init-test-db b/tools/setup/postgres-init-test-db
similarity index 100%
rename from setup/postgres-init-test-db
rename to tools/setup/postgres-init-test-db