diff --git a/.zuul.yaml b/.zuul.yaml
index 6e8d15fbcf..c89de5ba9a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -29,7 +29,6 @@
         TEMPEST_PLUGINS: '/opt/stack/heat-tempest-plugin'
         HEAT_USE_MOD_WSGI: True
         CEILOMETER_PIPELINE_INTERVAL: 60
-        GLOBAL_VENV: False
       devstack_services:
         tls-proxy: false
         s-account: false
diff --git a/devstack/lib/heat b/devstack/lib/heat
index c61e3add69..1a57e5a5e7 100644
--- a/devstack/lib/heat
+++ b/devstack/lib/heat
@@ -295,6 +295,10 @@ function install_heat {
            install_apache_wsgi
        fi
     fi
+    if [[ "$GLOBAL_VENV" == "True" ]] ; then
+        # TODO(tkajinam): find a better solution for this
+        sudo ln -sf $HEAT_BIN_DIR/heat-manage /usr/local/bin
+    fi
 }
 
 # start_heat() - Start running processes, including screen