diff --git a/cinder/tests/unit/volume/drivers/test_vzstorage.py b/cinder/tests/unit/volume/drivers/test_vzstorage.py
index d7d2a5531e1..d8ec2018ac8 100644
--- a/cinder/tests/unit/volume/drivers/test_vzstorage.py
+++ b/cinder/tests/unit/volume/drivers/test_vzstorage.py
@@ -56,8 +56,8 @@ class VZStorageTestCase(test.TestCase):
     def setUp(self):
         super(VZStorageTestCase, self).setUp()
 
-        self._remotefsclient = mock.patch.object(remotefs,
-                                                 'RemoteFsClient').start()
+        self._remotefsclient = mock.patch.object(
+            remotefs, 'VZStorageRemoteFSClient').start()
         get_mount_point = mock.Mock(return_value=self._FAKE_MNT_POINT)
         self._remotefsclient.get_mount_point = get_mount_point
         cfg = copy.copy(self._FAKE_VZ_CONFIG)
diff --git a/cinder/volume/drivers/vzstorage.py b/cinder/volume/drivers/vzstorage.py
index af7bcc98a61..132faa98a64 100644
--- a/cinder/volume/drivers/vzstorage.py
+++ b/cinder/volume/drivers/vzstorage.py
@@ -177,7 +177,7 @@ class VZStorageDriver(remotefs_drv.RemoteFSSnapDriver):
         self.base = self.configuration.vzstorage_mount_point_base
         opts = self.configuration.vzstorage_mount_options
 
-        self._remotefsclient = remotefs.RemoteFsClient(
+        self._remotefsclient = remotefs.VZStorageRemoteFSClient(
             'vzstorage', root_helper, execute=execute,
             vzstorage_mount_point_base=self.base,
             vzstorage_mount_options=opts)