diff --git a/aodh/api/controllers/v2/alarm_rules/gnocchi.py b/aodh/api/controllers/v2/alarm_rules/gnocchi.py
index 388850344..818addd0d 100644
--- a/aodh/api/controllers/v2/alarm_rules/gnocchi.py
+++ b/aodh/api/controllers/v2/alarm_rules/gnocchi.py
@@ -78,9 +78,9 @@ class AlarmGnocchiThresholdRule(base.AlarmRule):
         conf = pecan.request.cfg
         gnocchi_client = client.Client(
             '1', keystone_client.get_session(conf),
-            interface=conf.service_credentials.interface,
-            region_name=conf.service_credentials.region_name)
-
+            adapter_options={
+                'interface': conf.service_credentials.interface,
+                'region_name': conf.service_credentials.region_name})
         try:
             return gnocchi_client.capabilities.list().get(
                 'aggregation_methods', [])
@@ -182,9 +182,9 @@ class AggregationMetricByResourcesLookupRule(AlarmGnocchiThresholdRule):
 
         gnocchi_client = client.Client(
             '1', keystone_client.get_session(conf),
-            interface=conf.service_credentials.interface,
-            region_name=conf.service_credentials.region_name)
-
+            adapter_options={
+                'interface': conf.service_credentials.interface,
+                'region_name': conf.service_credentials.region_name})
         try:
             gnocchi_client.metric.aggregation(
                 metrics=rule.metric,
diff --git a/requirements.txt b/requirements.txt
index 812eac215..7c2f077f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ futures>=3.0;python_version=='2.7' or python_version=='2.6'  # BSD
 futurist>=0.11.0  # Apache-2.0
 jsonschema!=2.5.0,<3.0.0,>=2.0.0
 keystonemiddleware>=2.2.0
-gnocchiclient>=3.1.0,<4.0.0  # Apache-2.0
+gnocchiclient>=3.1.0  # Apache-2.0
 lxml>=2.3
 oslo.db>=4.8.0,!=4.13.1,!=4.13.2,!=4.15.0 # Apache-2.0
 oslo.config>=2.6.0 # Apache-2.0
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