diff --git a/cloudcafe/identity/v2_0/tenants_api/client.py b/cloudcafe/identity/v2_0/tenants_api/client.py
index 90bda1fd..e997825e 100644
--- a/cloudcafe/identity/v2_0/tenants_api/client.py
+++ b/cloudcafe/identity/v2_0/tenants_api/client.py
@@ -177,7 +177,7 @@ class TenantsAPI_Client(AutoMarshallingRestClient):
         @summary: Creates a user for a given tenant
         """
 
-        url = '{0}/tenants/{1}/users'.format(self.base_url, tenant_id)
+        url = '{0}/users'.format(self.base_url)
         user_request_object = User(id_=id_, tenant_id=tenant_id, name=name,
                                    enabled=enabled, email=email)
         response = self.request('POST', url,
diff --git a/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant.py b/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant.py
index 4a5b2e13..8fe21a9e 100644
--- a/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant.py
+++ b/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant.py
@@ -70,8 +70,7 @@ class Tenant(BaseIdentityModel):
         self.enabled = enabled
 
     def _obj_to_json(self):
-        json_dict = {"tenant": {"id": self.id_,
-                                "name": self.name,
+        json_dict = {"tenant": {"name": self.name,
                                 "description": self.description,
                                 "enabled": self.enabled}}
         return json.dumps(json_dict)
diff --git a/metatests/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant_test.py b/metatests/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant_test.py
index 94650332..ab55180e 100644
--- a/metatests/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant_test.py
+++ b/metatests/cloudcafe/identity/v2_0/tenants_api/models/responses/tenant_test.py
@@ -17,6 +17,11 @@ class TenantTest(TestCase):
             "description": self.tenant_description,
             "enabled": self.tenant_enabled}
 
+        self.tenant_json_dict = {
+            "name": self.tenant_name,
+            "description": self.tenant_description,
+            "enabled": self.tenant_enabled}
+
         self.href = "HREF"
         self.type = "TYPE"
         self.rel = "REL"
@@ -46,7 +51,8 @@ class TenantTest(TestCase):
                                       '"enabled": false, ' \
                                       '"name": "TENANT_NAME", ' \
                                       '"description": "TENANT_DESCRIPTION"}]}'
-        self.expected_tenant_json = json.dumps({"tenant": self.tenant_dict})
+        self.expected_tenant_json = json.dumps(
+            {"tenant": self.tenant_json_dict})
         self.expected_tenants_link_json = \
             json.dumps({"tenantsLink": self.tenants_link_dict})
 
diff --git a/metatests/cloudcafe/identity/v2_0/tenants_api/tenant_client_test.py b/metatests/cloudcafe/identity/v2_0/tenants_api/tenant_client_test.py
index e16b8dc0..c6f13970 100644
--- a/metatests/cloudcafe/identity/v2_0/tenants_api/tenant_client_test.py
+++ b/metatests/cloudcafe/identity/v2_0/tenants_api/tenant_client_test.py
@@ -104,11 +104,11 @@ class TenantsClientTest(TestCase):
         self._build_assertions(actual_response, self.user_url)
 
     def test_create_user_for_tenant(self):
-        HTTPretty.register_uri(HTTPretty.POST, self.tenant_users_url)
+        HTTPretty.register_uri(HTTPretty.POST, self.users_url)
 
         actual_response = self.tenant_api_client.create_user_for_a_tenant(
             name="Admin", tenant_id=self.tenant_id)
-        self._build_assertions(actual_response, self.tenant_users_url)
+        self._build_assertions(actual_response, self.users_url)
 
     def test_update_user(self):
         HTTPretty.register_uri(HTTPretty.PUT, self.user_url)