diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index b653931644..0000000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-echo
-echo "OS_TEST_PATH: $OS_TEST_PATH"
-echo "CEILOMETER_TEST_DEBUG: $CEILOMETER_TEST_DEBUG"
-echo
-
-if [ "$CEILOMETER_TEST_DEBUG" == "True" ]; then
-    oslo_debug_helper $*
-else
-    ./tools/pretty_tox.sh $*
-fi
diff --git a/tox.ini b/tox.ini
index 6e0836b43d..97e3756375 100644
--- a/tox.ini
+++ b/tox.ini
@@ -12,11 +12,9 @@ usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          OS_TEST_PATH=ceilometer/tests/unit
          CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}
-         CEILOMETER_TEST_DEBUG={env:CEILOMETER_TEST_DEBUG:}
-         debug: CEILOMETER_TEST_DEBUG=True
 passenv = OS_TEST_TIMEOUT OS_STDOUT_CAPTURE OS_STDERR_CAPTURE OS_LOG_CAPTURE CEILOMETER_*
 commands =
-   bash -x {toxinidir}/run-tests.sh "{posargs}"
+   {toxinidir}/tools/pretty_tox.sh "{posargs}"
    oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-generator.conf
 whitelist_externals = bash