diff --git a/devstack/gate_hook.sh b/devstack/gate_hook.sh
index 938bc0359..e73ad8ab2 100644
--- a/devstack/gate_hook.sh
+++ b/devstack/gate_hook.sh
@@ -14,11 +14,12 @@
 # under the License.
 
 export DEVSTACK_GATE_NEUTRON=1
-export DEVSTACK_GATE_TEMPEST=1
-export DEVSTACK_GATE_TEMPEST_ALL=1
-export DEVSTACK_GATE_TEMPEST_FULL=0
-export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=0
-export DEVSTACK_GATE_TEMPEST_REGEX=""
+export DEVSTACK_GATE_INSTALL_TESTONLY=1
+export DEVSTACK_GATE_NO_SERVICES=1
+export DEVSTACK_GATE_TEMPEST=0
+export DEVSTACK_GATE_EXERCISES=0
+export KEEP_LOCALRC=1
+
 
 export PROJECTS="openstack/aodh $PROJECTS"
 
@@ -43,7 +44,6 @@ ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
 ENABLED_SERVICES+=,ceilometer-api
 export ENABLED_SERVICES
 
-export KEEP_LOCALRC=1
 
 GATE_DEST=$BASE/new
 DEVSTACK_PATH=$GATE_DEST/devstack
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 19d64e949..b610d5d24 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -129,7 +129,7 @@ function configure_vitrage {
     iniset $VITRAGE_CONF service_credentials username admin
     iniset $VITRAGE_CONF service_credentials user_domain_id default
     iniset $VITRAGE_CONF service_credentials project_domain_id default
-    iniset $VITRAGE_CONF service_credentials password $SERVICE_PASSWORD
+    iniset $VITRAGE_CONF service_credentials password $ADMIN_PASSWORD
     iniset $VITRAGE_CONF service_credentials project_name admin
     iniset $VITRAGE_CONF service_credentials region_name $REGION_NAME
     iniset $VITRAGE_CONF service_credentials auth_url $KEYSTONE_SERVICE_URI
diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index faefbc7ca..38eebe55a 100644
--- a/devstack/post_test_hook.sh
+++ b/devstack/post_test_hook.sh
@@ -24,5 +24,5 @@ sudo pip install nose
 (cd $BASE/new/vitrage/; sudo rm -rf .testrepository/)
 (cd $BASE/new/vitrage/; sudo testr init)
 
-(cd $BASE/new/vitrage/; sudo sh -c 'testr list-tests vitrage_tempest_tests | grep -E "datasources|topology" > vitrage_tempest_tests.list')
+(cd $BASE/new/vitrage/; sudo sh -c 'testr list-tests vitrage_tempest_tests | grep -E "topology" > vitrage_tempest_tests.list')
 (cd $BASE/new/vitrage/; sudo sh -c 'testr run --subunit --load-list=vitrage_tempest_tests.list | subunit-trace --fails')