diff --git a/.zuul.yaml b/.zuul.yaml
index b4401f5401..e3a8ee421d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,13 +1,15 @@
 - job:
     name: grenade-ceilometer
     parent: grenade
+    voting: false
     required-projects:
       - opendev.org/openstack/grenade
       - opendev.org/openstack/ceilometer
     vars:
+      configure_swap_size: 8192
       grenade_devstack_localrc:
         shared:
-          CEILOMETER_BACKEND: none
+          CEILOMETER_BACKEND: gnocchi
       devstack_plugins:
         ceilometer: https://opendev.org/openstack/ceilometer
       devstack_services:
@@ -46,20 +48,3 @@
             irrelevant-files: *ceilometer-irrelevant-files
         - telemetry-dsvm-integration-ipv6-only:
             irrelevant-files: *ceilometer-irrelevant-files
-    experimental:
-      jobs:
-        # TripleO jobs that deploy Telemetry.
-        # Note we don't use a project-template here, so it's easier
-        # to disable voting on one specific job if things go wrong.
-        # tripleo-ci-centos-7-scenario00(1|2)-multinode-oooq will only
-        # run on stable/pike while the -container will run in Queens
-        # and beyond.
-        # If you need any support to debug these jobs in case of
-        # failures, please reach us on #tripleo IRC channel.
-        # NOTE(sileht): These job takes 3 hours and fail most of the times.
-        # While other jobs take 20-30 minutes
-        # We can reenable it when they take less times.
-        - tripleo-ci-centos-7-scenario001-multinode-oooq
-        - tripleo-ci-centos-7-scenario001-standalone
-        - tripleo-ci-centos-7-scenario002-multinode-oooq
-        - tripleo-ci-centos-7-scenario002-standalone
diff --git a/requirements.txt b/requirements.txt
index b640c6a6b7..3713e08ba0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -31,7 +31,7 @@ python-cinderclient>=3.3.0  # Apache-2.0
 PyYAML>=5.1 # MIT
 requests!=2.9.0,>=2.8.1 # Apache-2.0
 stevedore>=1.20.0 # Apache-2.0
-tenacity>=4.12.0,<7.0.0  # Apache-2.0
+tenacity>=4.12.0  # Apache-2.0
 tooz[zake]>=1.47.0 # Apache-2.0
 os-xenapi>=0.3.3 # Apache-2.0
 oslo.cache>=1.26.0 # Apache-2.0
diff --git a/tox.ini b/tox.ini
index 3c94b78e80..027bcb268e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,8 +6,9 @@ ignore_basepython_conflict=true
 
 [testenv]
 basepython = python3
-deps = -r{toxinidir}/test-requirements.txt
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+deps =
+  -r{toxinidir}/test-requirements.txt
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}
@@ -46,7 +47,7 @@ commands = oslo-config-generator --config-file=etc/ceilometer/ceilometer-config-
 
 [testenv:docs]
 deps =
-  -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/doc/requirements.txt
 commands = sphinx-build -b html doc/source doc/build/html
 setenv = PYTHONHASHSEED=0