diff --git a/tests/aws/models/iam/access_keys_tests.rb b/tests/aws/models/iam/access_keys_tests.rb
index a233821ee..da77ddde7 100644
--- a/tests/aws/models/iam/access_keys_tests.rb
+++ b/tests/aws/models/iam/access_keys_tests.rb
@@ -4,16 +4,16 @@ Shindo.tests("Fog::Compute[:iam] | access_keys", ['aws','iam']) do
   iam = Fog::AWS[:iam]
   
   @username = 'fake_user'
-  @users = iam.users.create(:id => @username)
+  @user = iam.users.create(:id => @username)
 
   
   tests('#all', 'there are no access keys for a new user').succeeds do
-    @users.access_keys.empty?
+    @user.access_keys.empty?
   end
   
   
   tests('#create','an access key').succeeds do
-    access_key = @users.access_keys.create
+    access_key = @user.access_keys.create
     access_key.id =~ /[A-Z0-9]{20}/
     access_key.secret_access_key =~ /[\S]{40}/
     access_key.status == "Active"
@@ -21,15 +21,15 @@ Shindo.tests("Fog::Compute[:iam] | access_keys", ['aws','iam']) do
     @access_key_id = access_key.id
   end
   
-  @users.access_keys.create
+  @user.access_keys.create
   
   tests('#all','there are two access keys').succeeds do
-    @users.access_keys.size == 2
+    @user.access_keys.size == 2
   end
   
   tests('#get') do
     tests('a valid access key id').succeeds do
-      access_key = @users.access_keys.get(@access_key_id)
+      access_key = @user.access_keys.get(@access_key_id)
       access_key.id == @access_key_id
       access_key.secret_access_key == nil
       access_key.status == "Active"
@@ -37,16 +37,17 @@ Shindo.tests("Fog::Compute[:iam] | access_keys", ['aws','iam']) do
     end
     
     tests('an invalid access key').succeeds do
-      @users.access_keys.get('non-existing') == nil
+      @user.access_keys.get('non-existing') == nil
     end
   end
   
-  tests('#destroy', decrease by one the number of access keys).succeeds do
-    size = @users.access_keys.size
-    @users.access_keys.get(@access_key_id).destroy
-    @users.access_keys.size == ( size - 1 )
+  tests('#destroy', 'decrease by one the number of access keys').succeeds do
+    size = @user.access_keys.size
+    @user.access_keys.get(@access_key_id).destroy
+    @user.access_keys.size == ( size - 1 )
   end
   
-
+  # clean up
+  @user.destroy
   
 end
\ No newline at end of file
diff --git a/tests/aws/models/iam/policies_tests.rb b/tests/aws/models/iam/policies_tests.rb
index 35694c587..a82ccb89d 100644
--- a/tests/aws/models/iam/policies_tests.rb
+++ b/tests/aws/models/iam/policies_tests.rb
@@ -4,45 +4,47 @@ Shindo.tests("Fog::Compute[:iam] | policies", ['aws','iam']) do
   iam = Fog::AWS[:iam]
   
   @username = 'fake_user'
-  @users = iam.users.create(:id => @username)
+  @user = iam.users.create(:id => @username)
   @policy_document = {"Statement"=>[{"Action"=>["sqs:*"], "Effect"=>"Allow", "Resource"=>"*"}]}
   @policy_name = 'fake-sqs-policy'
   
   tests('#all', 'there is no policies').succeeds do
-    @users.policies.empty?
+    @user.policies.empty?
   end
   
   
   tests('#create','a policy').succeeds do
-    policy = @users.policies.create(id: @policy_name, document: @policy_document)
+    policy = @user.policies.create(id: @policy_name, document: @policy_document)
     policy.id == @policy_name
     policy.username == @username
     #policy.document == @policy_document # FIXME, the format isn't right
   end
   
-  @users.policies.create(id: 'another-policy', document: {})
+  @user.policies.create(id: 'another-policy', document: {})
   
   tests('#all','there are two policies').succeeds do
-    @users.policies.size == 2
+    @user.policies.size == 2
   end
   
   tests('#get') do
     tests('a valid policy').succeeds do
-      policy = @users.policies.get(@policy_name)
-      policy.id == @policy_name
+      policy = @user.policies.get(@policy_name)
+      policy.id == @polic_name
       policy.username == @username
       #policy.document == @policy_document # FIXME, the format isn't right    
     end
     
     tests('an invalid policy').succeeds do
-      @users.policies.get('non-existing') == nil
+      @user.policies.get('non-existing') == nil
     end
   end
   
   tests('#destroy').succeeds do
-    @users.policies.get(@policy_name).destroy
+    @user.policies.get(@policy_name).destroy
   end
   
+  # clean up
+  @user.destroy
 
   
 end
\ No newline at end of file