diff --git a/contrib/ci/pre_test_hook.sh b/contrib/ci/pre_test_hook.sh
index 677249b1..35eb6a54 100755
--- a/contrib/ci/pre_test_hook.sh
+++ b/contrib/ci/pre_test_hook.sh
@@ -47,7 +47,7 @@ fi
 
 # Go to Tempest dir and checkout stable commit to avoid possible
 # incompatibilities for plugin stored in Manila repo.
-TEMPEST_COMMIT="d8f38aba"  # 21 Mar, 2015
+TEMPEST_COMMIT="628c965d"  # 23 Apr, 2015
 cd $BASE/new/tempest
 git checkout $TEMPEST_COMMIT
 
diff --git a/contrib/tempest/tempest/api/share/base.py b/contrib/tempest/tempest/api/share/base.py
index c009fca4..35558371 100644
--- a/contrib/tempest/tempest/api/share/base.py
+++ b/contrib/tempest/tempest/api/share/base.py
@@ -116,7 +116,7 @@ class BaseSharesTest(test.BaseTestCase):
                 name = name[0:32]
 
         # Choose type of isolated creds
-        ic = isolated_creds.IsolatedCreds(name)
+        ic = isolated_creds.IsolatedCreds(name=name)
         if "admin" in type_of_creds:
             creds = ic.get_admin_creds()
         elif "alt" in type_of_creds:
@@ -253,7 +253,7 @@ class BaseSharesTest(test.BaseTestCase):
 
                 # Create suitable network
                 if (net_id is None or subnet_id is None):
-                    ic = isolated_creds.IsolatedCreds(service_net_name)
+                    ic = isolated_creds.IsolatedCreds(name=service_net_name)
                     identity_client = cls._get_identity_admin_client()
                     tenant = identity_client.\
                         get_tenant_by_name(sc.auth_params["tenant"])
@@ -273,11 +273,10 @@ class BaseSharesTest(test.BaseTestCase):
             else:
                 sn_name = "autogenerated_by_tempest_for_isolated_creds"
                 # Use precreated network and subnet from isolated creds
-                net_resources = (
-                    isolated_creds_client.isolated_net_resources[
-                        isolated_creds_client.type_of_creds])
-                net_id = net_resources[0]["id"]
-                subnet_id = net_resources[1]["id"]
+                net_id = isolated_creds_client.get_credentials(
+                    isolated_creds_client.type_of_creds).network['id']
+                subnet_id = isolated_creds_client.get_credentials(
+                    isolated_creds_client.type_of_creds).subnet['id']
 
             # Create suitable share-network
             if share_network_id is None: