diff --git a/novaclient/tests/functional/base.py b/novaclient/tests/functional/base.py
index 138d5f513..eb306a529 100644
--- a/novaclient/tests/functional/base.py
+++ b/novaclient/tests/functional/base.py
@@ -13,7 +13,6 @@
 import os
 import time
 
-from cinderclient.v3 import client as cinderclient
 import fixtures
 from keystoneauth1.exceptions import discovery as discovery_exc
 from keystoneauth1 import identity
@@ -271,7 +270,6 @@ class ClientTestBase(testtools.TestCase):
         self.keystone = keystoneclient.Client(session=session,
                                               username=user,
                                               password=passwd)
-        self.cinder = cinderclient.Client(auth=auth, session=session)
 
     def _get_novaclient(self, session):
         nc = novaclient.client.Client("2", session=session)
@@ -332,7 +330,7 @@ class ClientTestBase(testtools.TestCase):
         """
         start_time = time.time()
         while time.time() - start_time < timeout:
-            volume = self.cinder.volumes.get(volume.id)
+            volume = self.openstack.block_storage.get_volume(volume)
             if volume.status == status:
                 break
             time.sleep(poll_interval)
diff --git a/novaclient/tests/functional/v2/legacy/test_extended_attributes.py b/novaclient/tests/functional/v2/legacy/test_extended_attributes.py
index 6affb742f..2b2378485 100644
--- a/novaclient/tests/functional/v2/legacy/test_extended_attributes.py
+++ b/novaclient/tests/functional/v2/legacy/test_extended_attributes.py
@@ -22,8 +22,8 @@ class TestExtAttrNovaClient(base.ClientTestBase):
 
     def _create_server_and_attach_volume(self):
         server = self._create_server()
-        volume = self.cinder.volumes.create(1)
-        self.addCleanup(volume.delete)
+        volume = self.openstack.block_storage.create_volume(size=1)
+        self.addCleanup(self.openstack.block_storage.delete_volume, volume)
         self.wait_for_volume_status(volume, 'available')
         self.nova('volume-attach', params="%s %s" % (server.name, volume.id))
         self.addCleanup(self._release_volume, server, volume)
diff --git a/novaclient/tests/functional/v2/legacy/test_instances.py b/novaclient/tests/functional/v2/legacy/test_instances.py
index 131407a77..f933ec1e7 100644
--- a/novaclient/tests/functional/v2/legacy/test_instances.py
+++ b/novaclient/tests/functional/v2/legacy/test_instances.py
@@ -53,8 +53,8 @@ class TestInstanceCLI(base.ClientTestBase):
         self.addCleanup(server.delete)
 
         # create a volume for attachment
-        volume = self.cinder.volumes.create(1)
-        self.addCleanup(volume.delete)
+        volume = self.openstack.block_storage.create_volume(size=1)
+        self.addCleanup(self.openstack.block_storage.delete_volume, volume)
 
         # allow volume to become available
         self.wait_for_volume_status(volume, 'available')
diff --git a/novaclient/tests/functional/v2/legacy/test_servers.py b/novaclient/tests/functional/v2/legacy/test_servers.py
index 246b8d60c..ded7eb3a5 100644
--- a/novaclient/tests/functional/v2/legacy/test_servers.py
+++ b/novaclient/tests/functional/v2/legacy/test_servers.py
@@ -25,9 +25,8 @@ class TestServersBootNovaClient(base.ClientTestBase):
     def _boot_server_with_legacy_bdm(self, bdm_params=()):
         volume_size = 1
         volume_name = self.name_generate()
-        volume = self.cinder.volumes.create(size=volume_size,
-                                            name=volume_name,
-                                            imageRef=self.image.id)
+        volume = self.openstack.block_storage.create_volume(
+            size=volume_size, name=volume_name, image_id=self.image.id)
         self.wait_for_volume_status(volume, "available")
 
         if (len(bdm_params) >= 3 and bdm_params[2] == '1'):
@@ -56,8 +55,8 @@ class TestServersBootNovaClient(base.ClientTestBase):
         self.wait_for_resource_delete(server_id, self.client.servers)
 
         if delete_volume:
-            self.cinder.volumes.delete(volume.id)
-            self.wait_for_resource_delete(volume.id, self.cinder.volumes)
+            self.openstack.block_storage.delete_volume(volume)
+            self.openstack.block_storage.wait_for_delete(volume)
 
     def test_boot_server_with_legacy_bdm(self):
         # bdm v1 format
diff --git a/test-requirements.txt b/test-requirements.txt
index 1004a2837..428e3b629 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,7 +4,6 @@ coverage>=4.4.1 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD
 python-keystoneclient>=3.8.0 # Apache-2.0
-python-cinderclient>=4.0.1 # Apache-2.0
 python-neutronclient>=6.7.0 # Apache-2.0
 requests-mock>=1.2.0 # Apache-2.0
 openstacksdk>=0.11.2 # Apache-2.0