diff --git a/lib/heat b/lib/heat
index 13bf130b15..85177738dc 100644
--- a/lib/heat
+++ b/lib/heat
@@ -41,11 +41,6 @@ function cleanup_heat() {
     sudo rm -rf $HEAT_AUTH_CACHE_DIR
 }
 
-# configure_heatclient() - Set config files, create data dirs, etc
-function configure_heatclient() {
-    setup_develop $HEATCLIENT_DIR
-}
-
 # configure_heat() - Set config files, create data dirs, etc
 function configure_heat() {
     setup_develop $HEAT_DIR
@@ -176,6 +171,7 @@ function create_heat_cache_dir() {
 # install_heatclient() - Collect source and prepare
 function install_heatclient() {
     git_clone $HEATCLIENT_REPO $HEATCLIENT_DIR $HEATCLIENT_BRANCH
+    setup_develop $HEATCLIENT_DIR
 }
 
 # install_heat() - Collect source and prepare
diff --git a/stack.sh b/stack.sh
index 3fa025f939..cdc45fddfb 100755
--- a/stack.sh
+++ b/stack.sh
@@ -739,11 +739,10 @@ if is_service_enabled ceilometer; then
 fi
 
 if is_service_enabled heat; then
-    install_heat
     install_heatclient
+    install_heat
     cleanup_heat
     configure_heat
-    configure_heatclient
 fi
 
 if is_service_enabled tls-proxy; then