diff --git a/run-tests.sh b/run-tests.sh
index b0484761a..50198945f 100755
--- a/run-tests.sh
+++ b/run-tests.sh
@@ -1,5 +1,10 @@
 #!/bin/bash -x
 set -e
+
+export OS_TEST_PATH=aodh/tests/unit
+./tools/pretty_tox.sh $*
+
+export OS_TEST_PATH=aodh/tests/functional
 AODH_TEST_DRIVERS=${AODH_TEST_DRIVERS:-postgresql}
 for indexer in ${AODH_TEST_DRIVERS}
 do
diff --git a/tools/pretty_tox.sh b/tools/pretty_tox.sh
index b96dc3f24..5094f61e0 100755
--- a/tools/pretty_tox.sh
+++ b/tools/pretty_tox.sh
@@ -10,7 +10,7 @@ TESTRARGS=$*
 #
 # this work around exists until that is addressed
 if [[ "$TESTARGS" =~ "until-failure" ]]; then
-    ostestr --slowest $TESTRARGS
+    python setup.py testr --slowest --testr-args="$TESTRARGS"
 else
-    ostestr --no-pretty --slowest --subunit $TESTRARGS | subunit-trace -f
+    python setup.py testr --slowest --testr-args="--subunit $TESTRARGS" | subunit-trace -f
 fi
diff --git a/tox.ini b/tox.ini
index 05cea4fa5..844b73d17 100644
--- a/tox.ini
+++ b/tox.ini
@@ -17,7 +17,7 @@ setenv =
 deps = .[test,{env:AODH_TEST_DEPS}]
 passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE AODH_TEST_DRIVERS
 commands =
-   {toxinidir}/run-tests.sh  --black-regex '^aodh\.tests\.tempest\..*$' {posargs}
+   {toxinidir}/run-tests.sh {posargs}
    {toxinidir}/run-functional-tests.sh "{posargs}"
    aodh-config-generator