diff --git a/scripts/setup/initialize-database b/scripts/setup/initialize-database
index 915ad701e9..d7721fecf8 100755
--- a/scripts/setup/initialize-database
+++ b/scripts/setup/initialize-database
@@ -3,12 +3,6 @@
 # Change to root directory of the checkout that we're running from
 cd $(dirname $0)/../..
 
-psql <<EOF
-DROP SCHEMA zulip CASCADE;
-DROP SCHEMA public CASCADE;
-CREATE SCHEMA zulip;
-EOF
-
 python manage.py checkconfig
 
 python manage.py migrate --noinput
diff --git a/scripts/setup/postgres-init-db b/scripts/setup/postgres-init-db
index 4cf2b275f8..28b0356c82 100755
--- a/scripts/setup/postgres-init-db
+++ b/scripts/setup/postgres-init-db
@@ -1,4 +1,4 @@
-#/bin/sh -xe
+#!/bin/sh -xe
 
 su postgres -c psql <<EOF
 CREATE USER zulip;
@@ -7,5 +7,10 @@ DROP DATABASE IF EXISTS zulip;
 CREATE DATABASE zulip OWNER=zulip;
 EOF
 
+su postgres -c psql zulip <<EOF
+CREATE SCHEMA zulip OWNER=zulip;
+CREATE EXTENSION tsearch_extras SCHEMA zulip;
+EOF
+
 echo "Database created"