diff --git a/.zuul.yaml b/.zuul.yaml
index a0d1f554c2..adc6d1105b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -49,6 +49,13 @@
       - magnum_docker_login
     timeout: 2400
 
+- job:
+    name: magnum-tempest-plugin-tests-api-temporary
+    parent: magnum-tempest-plugin-tests-api
+    vars:
+      devstack_localrc:
+        GLANCE_LIMIT_IMAGE_SIZE_TOTAL: 5000
+
 - project:
     templates:
       - openstack-cover-jobs
@@ -58,12 +65,12 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - magnum-tempest-plugin-tests-api
+        - magnum-tempest-plugin-tests-api-temporary
         - magnum-container-build
     gate:
       queue: magnum
       jobs:
-        - magnum-tempest-plugin-tests-api
+        - magnum-tempest-plugin-tests-api-temporary
     post:
       jobs:
         - magnum-container-publish
diff --git a/magnum/common/clients.py b/magnum/common/clients.py
index bea968848e..fe8c367ea6 100644
--- a/magnum/common/clients.py
+++ b/magnum/common/clients.py
@@ -13,7 +13,7 @@
 # under the License.
 
 from barbicanclient.v1 import client as barbicanclient
-from cinderclient.v2 import client as cinder_client
+from cinderclient.v3 import client as cinder_client
 from glanceclient import client as glanceclient
 from heatclient import client as heatclient
 from keystoneauth1.exceptions import catalog