diff --git a/tests/openstack/models/identity/roles_tests.rb b/tests/openstack/models/identity/roles_tests.rb
index 1b42177a3..6e0dc1f85 100644
--- a/tests/openstack/models/identity/roles_tests.rb
+++ b/tests/openstack/models/identity/roles_tests.rb
@@ -14,6 +14,7 @@ Shindo.tests("Fog::Identity[:openstack] | roles", ['openstack']) do
     end
   end
 
+  @role.destroy
   @user.destroy
   @tenant.destroy
 end
diff --git a/tests/openstack/models/identity/user_tests.rb b/tests/openstack/models/identity/user_tests.rb
index 9ace034a6..63e50179e 100644
--- a/tests/openstack/models/identity/user_tests.rb
+++ b/tests/openstack/models/identity/user_tests.rb
@@ -26,11 +26,11 @@ Shindo.tests("Fog::Identity[:openstack] | user", ['openstack']) do
     end
 
     tests('#update_tenant').returns(true) do
-      @instance.update_tenant('swordfish')
+      @instance.update_tenant(tenant_id)
     end
 
     tests('#update_enabled').returns(true) do
-      @instance.update_enabled('swordfish')
+      @instance.update_enabled(true)
     end
 
     tests('#destroy').returns(true) do