diff --git a/ceilometer/tests/db.py b/ceilometer/tests/db.py
index a633dabf66..d8c74f7890 100644
--- a/ceilometer/tests/db.py
+++ b/ceilometer/tests/db.py
@@ -180,7 +180,7 @@ class TestBase(test_base.BaseTestCase):
 
     def setUp(self):
         super(TestBase, self).setUp()
-        db_url = os.environ.get('OVERTEST_URL', "sqlite://").replace(
+        db_url = os.environ.get('PIFPAF_URL', "sqlite://").replace(
             "mysql://", "mysql+pymysql://")
 
         engine = urlparse.urlparse(db_url).scheme
diff --git a/ceilometer/tests/functional/gabbi/fixtures.py b/ceilometer/tests/functional/gabbi/fixtures.py
index ed624cbaff..a8e81059ab 100644
--- a/ceilometer/tests/functional/gabbi/fixtures.py
+++ b/ceilometer/tests/functional/gabbi/fixtures.py
@@ -49,7 +49,7 @@ class ConfigFixture(fixture.GabbiFixture):
         self.conf = None
 
         # Determine the database connection.
-        db_url = os.environ.get('OVERTEST_URL', "sqlite://").replace(
+        db_url = os.environ.get('PIFPAF_URL', "sqlite://").replace(
             "mysql://", "mysql+pymysql://")
         if not db_url:
             raise case.SkipTest('No database connection configured')
diff --git a/run-functional-tests.sh b/run-functional-tests.sh
index ec230e300a..8ad0a6b477 100755
--- a/run-functional-tests.sh
+++ b/run-functional-tests.sh
@@ -7,5 +7,5 @@ if [ -z $CEILOMETER_TEST_BACKEND ]; then
 fi
 
 for backend in $CEILOMETER_TEST_BACKEND; do
-    overtest $backend ./tools/pretty_tox.sh $*
+    pifpaf run $backend ./tools/pretty_tox.sh $*
 done
diff --git a/test-requirements.txt b/test-requirements.txt
index 3c20820023..9aa5d54c60 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -16,7 +16,6 @@ oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 reno>=1.6.2 # Apache2
 oslotest>=1.10.0 # Apache-2.0
 oslo.vmware>=1.16.0 # Apache-2.0
-overtest>=0.10.0 # Apache-2.0
 psycopg2>=2.5 # LGPL/ZPL
 pymongo!=3.1,>=3.0.2 # Apache-2.0
 gnocchiclient>=2.2.0 # Apache-2.0
@@ -31,3 +30,4 @@ gabbi>=1.11.0 # Apache-2.0
 requests-aws>=0.1.4 # BSD License (3 clause)
 os-testr>=0.4.1 # Apache-2.0
 WebTest>=2.0 # MIT
+pifpaf>=0.0.11
diff --git a/tox.ini b/tox.ini
index f53fdc06f4..51f011d762 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,20 +18,20 @@ whitelist_externals = bash
 
 [testenv:py-mongodb]
 setenv = OS_TEST_PATH=ceilometer/tests/functional/
-commands = overtest mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
+commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
 [testenv:py-mysql]
 setenv = OS_TEST_PATH=ceilometer/tests/functional/
-commands = overtest mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
+commands = pifpaf run mysql {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
 [testenv:py-pgsql]
 setenv = OS_TEST_PATH=ceilometer/tests/functional/
-commands = overtest postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
+commands = pifpaf run postgresql {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
 # Functional tests for elastic search
 [testenv:py-elastic]
 setenv = OS_TEST_PATH=ceilometer/tests/functional/
-commands = overtest elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
+commands = pifpaf run elasticsearch {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
 [testenv:functional]
 setenv = VIRTUAL_ENV={envdir}
@@ -67,7 +67,7 @@ commands =
 [testenv:gabbi]
 setenv = OS_TEST_PATH=ceilometer/tests/functional/gabbi
 passenv = CEILOMETER_*
-commands = overtest mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
+commands = pifpaf run mongodb {toxinidir}/tools/pretty_tox.sh "{posargs}"
 
 [testenv:cover]
 setenv = OS_TEST_PATH=ceilometer/tests
@@ -100,19 +100,19 @@ commands = bash -x oslo_debug_helper {posargs}
 
 [testenv:debug-mongodb]
 setenv = OS_TEST_PATH=ceilometer/tests/functional
-commands = overtest mongodb oslo_debug_helper {posargs}
+commands = pifpaf --debug run mongodb oslo_debug_helper {posargs}
 
 [testenv:debug-mysql]
 setenv = OS_TEST_PATH=ceilometer/tests/functional
-commands = overtest mysql oslo_debug_helper {posargs}
+commands = pifpaf --debug run mysql oslo_debug_helper {posargs}
 
 [testenv:debug-pgsql]
 setenv = OS_TEST_PATH=ceilometer/tests/functional
-commands = overtest postgresql oslo_debug_helper {posargs}
+commands = pifpaf --debug run postgresql oslo_debug_helper {posargs}
 
 [testenv:debug-elastic]
 setenv = OS_TEST_PATH=ceilometer/tests/functional
-commands = overtest elasticsearch oslo_debug_helper {posargs}
+commands = pifpaf --debug run elasticsearch oslo_debug_helper {posargs}
 
 [flake8]
 ignore =