diff --git a/heat_integrationtests/post_test_hook.sh b/heat_integrationtests/post_test_hook.sh
index 34b6ae28c8..5d419d37d3 100755
--- a/heat_integrationtests/post_test_hook.sh
+++ b/heat_integrationtests/post_test_hook.sh
@@ -20,5 +20,5 @@ export DEST=${DEST:-/opt/stack/new}
 source $DEST/devstack/openrc admin admin
 sudo -E $DEST/heat/heat_integrationtests/prepare_test_env.sh
 sudo -E $DEST/heat/heat_integrationtests/prepare_test_network.sh
-source $DEST/devstack/openrc
+source $DEST/devstack/openrc demo demo
 sudo -E tox -eintegration
diff --git a/heat_integrationtests/pre_test_hook.sh b/heat_integrationtests/pre_test_hook.sh
index ef5472eaa4..326d386ad7 100755
--- a/heat_integrationtests/pre_test_hook.sh
+++ b/heat_integrationtests/pre_test_hook.sh
@@ -19,16 +19,19 @@ localconf=$BASE/new/devstack/local.conf
 
 echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localrc_path
 echo "HEAT_ENABLE_ADOPT_ABANDON=True" >> $localrc_path
+
 echo -e '[[post-config|$HEAT_CONF]]\n[DEFAULT]\n' >> $localconf
-echo -e 'notification_driver=messagingv2\n' >> $localconf
-echo -e 'num_engine_workers=2\n' >> $localconf
-echo -e 'plugin_dirs=$HEAT_DIR/heat_integrationtests/common/test_resources\n' >> $localconf
-echo -e 'hidden_stack_tags=hidden\n' >> $localconf
-echo -e '[heat_api]\nworkers=1\n' >> $localconf
-echo -e '[heat_api_cfn]\nworkers=1\n' >> $localconf
-echo -e '[heat_api_cloudwatch]\nworkers=1' >> $localconf
 
 if [ "$ENABLE_CONVERGENCE" == "true" ] ; then
     echo -e 'convergence_engine=true\n' >> $localconf
 fi
 
+echo -e 'notification_driver=messagingv2\n' >> $localconf
+echo -e 'num_engine_workers=2\n' >> $localconf
+echo -e 'plugin_dirs=$HEAT_DIR/heat_integrationtests/common/test_resources\n' >> $localconf
+echo -e 'hidden_stack_tags=hidden\n' >> $localconf
+
+echo -e '[heat_api]\nworkers=1\n' >> $localconf
+echo -e '[heat_api_cfn]\nworkers=1\n' >> $localconf
+echo -e '[heat_api_cloudwatch]\nworkers=1' >> $localconf
+
diff --git a/heat_integrationtests/prepare_test_network.sh b/heat_integrationtests/prepare_test_network.sh
index 41f42bab56..268fb2a5eb 100755
--- a/heat_integrationtests/prepare_test_network.sh
+++ b/heat_integrationtests/prepare_test_network.sh
@@ -21,7 +21,7 @@ PUB_SUBNET_ID=`neutron subnet-list | grep ' public-subnet ' | awk '{split($0,a,"
 ROUTER_GW_IP=`neutron port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F '"' -v subnet_id="${PUB_SUBNET_ID//[[:space:]]/}" '$4 == subnet_id { print $8; }'`
 
 # create a heat specific private network (default 'private' network has ipv6 subnet)
-source $DEST/devstack/openrc
+source $DEST/devstack/openrc demo demo
 HEAT_PRIVATE_SUBNET_CIDR=10.0.5.0/24
 neutron net-create heat-net
 neutron subnet-create --name heat-subnet heat-net $HEAT_PRIVATE_SUBNET_CIDR