diff --git a/.testr.conf b/.testr.conf
index 0e29d4c71..56ba15e36 100644
--- a/.testr.conf
+++ b/.testr.conf
@@ -1,7 +1,7 @@
 [DEFAULT]
 test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
              OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
-             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \
+             OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-120} \
              ${PYTHON:-python} -m subunit.run discover $DISCOVER_DIRECTORY $LISTOPT $IDOPTION
 test_id_option=--load-list $IDFILE
 test_list_option=--list
\ No newline at end of file
diff --git a/devstack/post_test_hook.sh b/devstack/post_test_hook.sh
index 46ce5f70a..faefbc7ca 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 vitrage > vitrage_tempest_tests.list')
+(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 run --subunit --load-list=vitrage_tempest_tests.list | subunit-trace --fails')