diff --git a/devstack/files/tempest/tempest.conf b/devstack/files/tempest/tempest.conf
index 9fc5e0a0f..77af8d996 100644
--- a/devstack/files/tempest/tempest.conf
+++ b/devstack/files/tempest/tempest.conf
@@ -33,7 +33,7 @@ admin_role = admin
 # API key to use when authenticating. (string value)
 # This option is deprecated for removal.
 # Its value may be silently ignored in the future.
-password = password
+password = secretadmin
 
 
 # The identity region name to use. Also used as the other services'
@@ -80,4 +80,4 @@ admin_project_name = admin
 # authenticating requests made by project isolation to create users
 # and projects (string value)
 # Deprecated group/name - [identity]/admin_password
-admin_password = password
+admin_password = secretadmin
diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index af572b018..66402ffd1 100644
--- a/devstack/post_test_hook.sh
+++ b/devstack/post_test_hook.sh
@@ -28,7 +28,9 @@ sudo cp $BASE/new/tempest/etc/logging.conf.sample $BASE/new/tempest/etc/logging.
 (cd $BASE/new/vitrage/; sudo pip install -r requirements.txt -r test-requirements.txt)
 (cd $BASE/new/vitrage/; sudo python setup.py install)
 
+(cd $BASE/new/tempest/; sudo rm -rf .testrepository)
 (cd $BASE/new/tempest/; sudo testr init)
 
+(cd $BASE/new/tempest/; sudo sh -c 'testr list-tests vitrage_tempest_tests')
 (cd $BASE/new/tempest/; sudo sh -c 'testr list-tests vitrage_tempest_tests | grep -E "topology" > vitrage_tempest_tests.list')
 (cd $BASE/new/tempest/; sudo sh -c 'testr run --subunit --load-list=vitrage_tempest_tests.list | subunit-trace --fails')