diff --git a/sahara/tests/integration/tests/base.py b/sahara/tests/integration/tests/base.py
index 4d45988089..089dc734ee 100644
--- a/sahara/tests/integration/tests/base.py
+++ b/sahara/tests/integration/tests/base.py
@@ -21,7 +21,7 @@ import uuid
 
 from neutronclient.v2_0 import client as neutron_client
 from novaclient.v1_1 import client as nova_client
-import savannaclient.client as savanna_client
+import saharaclient.client as sahara_client
 from swiftclient import client as swift_client
 import unittest2
 
@@ -64,13 +64,13 @@ class ITestCase(unittest2.TestCase):
             self.common_config.SAHARA_HOST, self.common_config.SAHARA_PORT
         )
 
-        self.sahara = savanna_client.Client(
-            self.common_config.SAHARA_API_VERSION,
+        self.sahara = sahara_client.Client(
+            version=self.common_config.SAHARA_API_VERSION,
             username=self.common_config.OS_USERNAME,
             api_key=self.common_config.OS_PASSWORD,
             project_name=self.common_config.OS_TENANT_NAME,
             auth_url=self.common_config.OS_AUTH_URL,
-            savanna_url='http://%s:%s/v%s/%s' % (
+            sahara_url='http://%s:%s/v%s/%s' % (
                 self.common_config.SAHARA_HOST,
                 self.common_config.SAHARA_PORT,
                 self.common_config.SAHARA_API_VERSION,
diff --git a/test-requirements.txt b/test-requirements.txt
index 4b89ec4ef7..74c03566bf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,4 +17,4 @@ testscenarios>=0.4
 testtools>=0.9.34
 unittest2
 
-python-savannaclient>=0.5.0
+python-saharaclient>=0.6.0