diff --git a/tempest/services/identity/json/identity_client.py b/tempest/services/identity/json/identity_client.py
index 68e7d4b..5b6eaa0 100644
--- a/tempest/services/identity/json/identity_client.py
+++ b/tempest/services/identity/json/identity_client.py
@@ -44,7 +44,7 @@
         post_body = {
             'name': name,
             'description': kwargs.get('description', ''),
-            'enabled': kwargs.get('enabled', 'true'),
+            'enabled': kwargs.get('enabled', True),
         }
         post_body = json.dumps({'tenant': post_body})
         resp, body = self.post('tenants', post_body, self.headers)
diff --git a/tempest/tests/identity/admin/test_tenants.py b/tempest/tests/identity/admin/test_tenants.py
index 594afe8..6385cec 100644
--- a/tempest/tests/identity/admin/test_tenants.py
+++ b/tempest/tests/identity/admin/test_tenants.py
@@ -229,7 +229,7 @@
         t_desc2 = rand_name('desc2-')
         resp, body = self.client.update_tenant(t_id, description=t_desc2)
         st2 = resp['status']
-        resp2_desc = body['extra']['description']
+        resp2_desc = body['description']
         self.assertTrue(st2.startswith('2'))
         self.assertNotEqual(resp1_desc, resp2_desc)
 
@@ -257,7 +257,7 @@
         t_en2 = True
         resp, body = self.client.update_tenant(t_id, enabled=t_en2)
         st2 = resp['status']
-        resp2_en = body['extra']['enabled']
+        resp2_en = body['enabled']
         self.assertTrue(st2.startswith('2'))
         self.assertNotEqual(resp1_en, resp2_en)
 
diff --git a/tempest/tests/identity/admin/test_users.py b/tempest/tests/identity/admin/test_users.py
index 8396b91..67b2517 100644
--- a/tempest/tests/identity/admin/test_users.py
+++ b/tempest/tests/identity/admin/test_users.py
@@ -130,6 +130,7 @@
         resp, user = self.client.create_user('user_1234', self.alt_password,
                                              self.data.tenant['id'],
                                              self.alt_email)
+        self.assertEquals('200', resp['status'])
         resp, body = self.client.delete_user(user['id'])
         self.assertEquals('204', resp['status'])
 
@@ -255,16 +256,18 @@
         resp, user1 = self.client.create_user('tenant_user1', 'password1',
                                               self.data.tenant['id'],
                                               'user1@123')
+        self.assertEquals('200', resp['status'])
         user_ids.append(user1['id'])
         self.data.users.append(user1)
         resp, user2 = self.client.create_user('tenant_user2', 'password2',
                                               self.data.tenant['id'],
                                               'user2@123')
+        self.assertEquals('200', resp['status'])
         user_ids.append(user2['id'])
         self.data.users.append(user2)
         #List of users for the respective tenant ID
         resp, body = self.client.list_users_for_tenant(self.data.tenant['id'])
-        self.assertTrue(resp['status'].startswith('2'))
+        self.assertTrue(resp['status'] in ('200', '203'))
         for i in body:
             fetched_user_ids.append(i['id'])
         #verifying the user Id in the list
@@ -286,17 +289,22 @@
         user_ids = list()
         fetched_user_ids = list()
         user_ids.append(user['id'])
-        self.client.assign_user_role(tenant['id'], user['id'], role['id'])
+        resp, role = self.client.assign_user_role(tenant['id'], user['id'],
+                                                  role['id'])
+        self.assertEquals('200', resp['status'])
         resp, second_user = self.client.create_user('second_user', 'password1',
                                                     self.data.tenant['id'],
                                                     'user1@123')
+        self.assertEquals('200', resp['status'])
         user_ids.append(second_user['id'])
         self.data.users.append(second_user)
-        self.client.assign_user_role(tenant['id'], second_user['id'],
-                                     role['id'])
+        resp, role = self.client.assign_user_role(tenant['id'],
+                                                  second_user['id'],
+                                                  role['id'])
+        self.assertEquals('200', resp['status'])
         #List of users with roles for the respective tenant ID
         resp, body = self.client.list_users_for_tenant(self.data.tenant['id'])
-        self.assertTrue(resp['status'].startswith('2'))
+        self.assertEquals('200', resp['status'])
         for i in body:
             fetched_user_ids.append(i['id'])
         #verifying the user Id in the list