diff --git a/test-requirements.txt b/test-requirements.txt
index a18572347d..1637c35d24 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -27,7 +27,7 @@ fixtures>=0.3.14
 lxml>=2.3
 # mock object framework
 mock>=1.0
-oslotest
+oslotest>=1.1.0.0a2
 # required to build documentation
 sphinx>=1.1.2,!=1.2.0,<1.3
 # test wsgi apps without starting an http server
diff --git a/tools/debug_helper.sh b/tools/debug_helper.sh
deleted file mode 100755
index e373cce941..0000000000
--- a/tools/debug_helper.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-TMP_DIR=`mktemp -d` || exit 1
-trap "rm -rf $TMP_DIR" EXIT
-
-ALL_TESTS=$TMP_DIR/all_tests
-TESTS_TO_RUN=$TMP_DIR/ks_to_run
-
-python -m testtools.run discover -t ./ ./keystone/tests --list > $ALL_TESTS
-
-if [ "$1" ]; then
-    grep "$1" < $ALL_TESTS > $TESTS_TO_RUN
-else
-    mv $ALL_TESTS $TESTS_TO_RUN
-fi
-
-STANDARD_THREADS=1 python -m testtools.run discover --load-list $TESTS_TO_RUN
diff --git a/tox.ini b/tox.ini
index 2d5a631941..5edee41aae 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,7 +48,7 @@ commands =
   flake8 {posargs}
   # Run bash8 during pep8 runs to ensure violations are caught by
   # the check and gate queues
-  bashate examples/pki/gen_pki.sh tools/debug_helper.sh
+  bashate examples/pki/gen_pki.sh
   # Check that .po and .pot files are valid.
   # NOTE(jaegerandi): We search for files ending with '.po' or '.pot'.
   # The regex '.*\.pot?' does not work on OS X and we assume there are no
@@ -66,9 +66,7 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 commands = {posargs}
 
 [testenv:debug]
-
-commands =
- {toxinidir}/tools/debug_helper.sh {posargs}
+commands = oslo_debug_helper.sh {posargs}
 
 [flake8]
 filename= *.py,keystone-*