diff --git a/scripts/lib/install b/scripts/lib/install
index ef0922334f..966bc0ab19 100755
--- a/scripts/lib/install
+++ b/scripts/lib/install
@@ -276,7 +276,7 @@ EOF
     #
     # (There are more possibilities in the case of dpkg errors.)  Here
     # we are checking for either empty or not-installed.
-    if [ -n "$TRAVIS" ] || ! dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null | grep -vq ' not-installed$'; then
+    if ! dpkg-query --showformat '${Status}\n' -W rabbitmq-server 2>/dev/null | grep -vq ' not-installed$'; then
         cat <<EOF
 
 [rabbitmq]
diff --git a/tools/ci/production-helper b/tools/ci/production-helper
index c09545d2c8..729704555b 100755
--- a/tools/ci/production-helper
+++ b/tools/ci/production-helper
@@ -17,12 +17,8 @@ if ! apt-get dist-upgrade -y "${APT_OPTIONS[@]}"; then
     apt-get dist-upgrade -y "${APT_OPTIONS[@]}"
 fi
 
-# Disable existing rabbitmq node so we can change it
-service rabbitmq-server stop
-rm -rf /var/lib/rabbitmq/mnesia/
-
 # Install Zulip
-env TRAVIS=1 "$ZULIP_PATH"/scripts/setup/install --self-signed-cert --hostname 127.0.0.1 --email circleci@example.com
+"$ZULIP_PATH"/scripts/setup/install --self-signed-cert --hostname 127.0.0.1 --email circleci@example.com
 
 cat >>/etc/zulip/settings.py <<EOF
 # Circle CI override settings above
diff --git a/tools/ci/setup-production b/tools/ci/setup-production
index a31161a46f..4ed9062bc5 100755
--- a/tools/ci/setup-production
+++ b/tools/ci/setup-production
@@ -23,7 +23,7 @@ tools/provision --production-test-suite || {
 cp -a tools/ci/success-http-headers.txt ~/
 source tools/ci/activate-venv
 
-if ! env TRAVIS=1 ./tools/build-release-tarball test; then
+if ! ./tools/build-release-tarball test; then
     echo "Attempting to output failure logging data"
     cat /tmp/tmp.*/update-prod-static.log || true
     exit 1
diff --git a/tools/provision b/tools/provision
index d7a7526d82..169e446f27 100755
--- a/tools/provision
+++ b/tools/provision
@@ -38,7 +38,7 @@ if [ "$failed" -ne 0 ]; then
     echo "* Logs are here: zulip/var/log/provision.log"
     echo -e "$ENDC"
     exit "$failed"
-elif [ "$VIRTUAL_ENV" != "/srv/zulip-py3-venv" ] && [ -z "${TRAVIS}${SKIP_VENV_SHELL_WARNING}" ]; then
+elif [ "$VIRTUAL_ENV" != "/srv/zulip-py3-venv" ] && [ -z "${CIRCLECI}${SKIP_VENV_SHELL_WARNING}" ]; then
     echo -e "$WARNING"
     echo "WARNING: This shell does not have the Zulip Python 3 virtualenv activated."
     echo "Zulip commands will fail until you activate the virtualenv."