diff --git a/rally-jobs/heat.yaml b/rally-jobs/heat.yaml
index 3df57d4b..268143b5 100644
--- a/rally-jobs/heat.yaml
+++ b/rally-jobs/heat.yaml
@@ -192,22 +192,22 @@
         failure_rate:
           max: 0
 
-  HeatStacks.list_stacks_and_resources:
-    -
-      runner:
-        type: "constant"
-        times: 6
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 3
-        stacks:
-          stacks_per_tenant: 2
-          resources_per_stack: 10
-      sla:
-        failure_rate:
-          max: 0
+ # HeatStacks.list_stacks_and_resources:
+ #   -
+ #     runner:
+ #       type: "constant"
+ #       times: 6
+ #       concurrency: 3
+ #     context:
+ #       users:
+ #         tenants: 2
+ #         users_per_tenant: 3
+ #       stacks:
+ #         stacks_per_tenant: 2
+ #         resources_per_stack: 10
+ #     sla:
+ #       failure_rate:
+ #         max: 0
 
   HeatStacks.create_suspend_resume_delete_stack:
     -
@@ -225,22 +225,22 @@
         failure_rate:
           max: 0
 
-  HeatStacks.list_stacks_and_events:
-    -
-      runner:
-        type: "constant"
-        times: 6
-        concurrency: 3
-      context:
-        users:
-          tenants: 2
-          users_per_tenant: 3
-        stacks:
-          stacks_per_tenant: 2
-          resources_per_stack: 10
-      sla:
-        failure_rate:
-          max: 0
+  #HeatStacks.list_stacks_and_events:
+  #  -
+  #    runner:
+  #      type: "constant"
+  #      times: 6
+  #      concurrency: 3
+  #    context:
+  #      users:
+  #        tenants: 2
+  #        users_per_tenant: 3
+  #      stacks:
+  #        stacks_per_tenant: 2
+  #        resources_per_stack: 10
+  #    sla:
+  #      failure_rate:
+  #        max: 0
 
   HeatStacks.create_snapshot_restore_delete_stack:
     -
diff --git a/test-requirements.txt b/test-requirements.txt
index ff9aed33..4e26bfec 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -11,8 +11,6 @@ pytest-cov>=2.2.1,<=2.5.1                              # MIT
 pytest-html>=1.10.0,<=1.14.2                           # Mozilla Public License 2.0 (MPL 2.0)
 # py.test xdist plugin for distributed testing and loop-on-failing modes
 pytest-xdist<=1.15.0                                   # MIT
-# py.test plugin to abort hanging tests
-pytest-timeout<=1.2.0                                  # MIT
 
 coverage>=4.0,!=4.4,<=4.4.1                            # Apache License, Version 2.0
 ddt>=1.0.1,<=1.1.1
diff --git a/tests/ci/cover.sh b/tests/ci/cover.sh
index 81fdb87f..ba693778 100755
--- a/tests/ci/cover.sh
+++ b/tests/ci/cover.sh
@@ -33,7 +33,7 @@ fi
 git checkout HEAD^
 
 baseline_report=$(mktemp -t rally_coverageXXXXXXX)
-py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto
+py.test --cov=rally tests/unit/ --cov-report=html -n auto
 coverage report > $baseline_report
 mv cover cover-master
 cat $baseline_report
@@ -43,7 +43,7 @@ baseline_missing=$(awk 'END { print $3 }' $baseline_report)
 git checkout -
 
 current_report=$(mktemp -t rally_coverageXXXXXXX)
-py.test --cov=rally tests/unit/ --cov-report=html --timeout=60 -n auto
+py.test --cov=rally tests/unit/ --cov-report=html -n auto
 coverage report > $current_report
 current_missing=$(awk 'END { print $3 }' $current_report)
 
diff --git a/tests/ci/pytest_launcher.py b/tests/ci/pytest_launcher.py
index 98d8e387..d1e76d10 100755
--- a/tests/ci/pytest_launcher.py
+++ b/tests/ci/pytest_launcher.py
@@ -26,7 +26,6 @@ PYTEST_ARGUMENTS = ("py.test"  # base command
                     " --self-contained-html"  # embedded css
                     " --durations=10"  # get a list of the slowest 10 tests
                     " -n auto"  # launch tests in parallel
-                    " --timeout=%(timeout)s"  # timeout for individual test
                     " %(path)s"
                     )
 
diff --git a/tests/ci/rally_verify.py b/tests/ci/rally_verify.py
index 78fa0835..dda1421c 100755
--- a/tests/ci/rally_verify.py
+++ b/tests/ci/rally_verify.py
@@ -277,7 +277,8 @@ class ExtendVerifier(Step):
 
     COMMAND = "verify add-verifier-ext --source %(source)s"
     DEPENDS_ON = CreateVerifier
-    CALL_ARGS = {"source": "https://git.openstack.org/openstack/keystone"}
+    CALL_ARGS = {"source": "https://git.openstack.org/openstack/"
+                           "keystone-tempest-plugin"}
 
 
 class ListVerifierExtensions(Step):