diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index ae919b6bb5..6e1d0ae099 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -18,7 +18,9 @@ if is_heat_enabled; then
 
     elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
         if is_service_enabled tempest; then
-            setup_develop $TEMPEST_DIR
+            if [[ "$INSTALL_TEMPEST" == "True" ]]; then
+                setup_develop $TEMPEST_DIR
+            fi
         fi
 
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then