diff --git a/tests/core/credential_tests.rb b/tests/core/credential_tests.rb
index 208f24019..90d37d3a4 100644
--- a/tests/core/credential_tests.rb
+++ b/tests/core/credential_tests.rb
@@ -1,16 +1,12 @@
 Shindo.tests do
   before do
-    @old_home = ENV['HOME']
-    @old_rc   = ENV['FOG_RC']
-    @old_credential = ENV['FOG_CREDENTIAL']
+    @old_credentials = Fog.credentials
     Fog.instance_variable_set('@credential_path', nil) # kill memoization
     Fog.instance_variable_set('@credential', nil) # kill memoization
   end
 
   after do
-    ENV['HOME'] = @old_home
-    ENV['FOG_RC'] = @old_rc
-    ENV['FOG_CREDENTIAL'] = @old_credential
+    Fog.credentials = @old_credentials
   end
 
   tests('credential') do