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
diff --git a/heat_integrationtests/prepare_test_network.sh b/heat_integrationtests/prepare_test_network.sh
index 4900263828..df78fdcd7b 100755
--- a/heat_integrationtests/prepare_test_network.sh
+++ b/heat_integrationtests/prepare_test_network.sh
@@ -22,5 +22,5 @@ HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24
 source $TOP_DIR/openrc demo demo
 
 openstack network show heat-net || openstack network create heat-net
-openstack subnet show heat-subnet || openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR
-openstack router add subnet router1 heat-subnet
+subnet_id=$((openstack subnet show heat-subnet || openstack subnet create heat-subnet --network heat-net --subnet-range $HEAT_PRIVATE_SUBNET_CIDR) | grep " id " | awk '{print $4}')
+openstack router show router1 -c interfaces_info | grep -q $subnet_id || openstack router add subnet router1 $subnet_id