diff --git a/.gitignore b/.gitignore
index cc588ee8c..f6081d374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 .bundle
 .DS_Store
 .idea
+/tests/.fog
 bin/*
 !bin/fog
 !bin/rdoc
diff --git a/Rakefile b/Rakefile
index 9b89d7017..1bb73af78 100644
--- a/Rakefile
+++ b/Rakefile
@@ -59,7 +59,7 @@ namespace :test do
 end
 
 task :test do
-  Rake::Task[:mock_tests].invoke && Rake::Task[:real_tests].invoke
+  Rake::Task[:mock_tests].invoke
 end
 
 def tests(mocked)
diff --git a/tests/helper.rb b/tests/helper.rb
index 6e9b26cfd..2b4b7ae6c 100644
--- a/tests/helper.rb
+++ b/tests/helper.rb
@@ -1,3 +1,6 @@
+ENV['FOG_RC']         = File.expand_path '../.fog', __FILE__
+ENV['FOG_CREDENTIAL'] = 'default'
+
 require 'fog'
 require 'fog/bin' # for available_providers and registered_providers
 
@@ -22,7 +25,7 @@ available_providers = Fog.available_providers.map {|provider| provider.downcase}
 unavailable_providers = all_providers - available_providers
 
 for provider in unavailable_providers
-  Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '~/.fog' to run them)[/]")
+  Formatador.display_line("[yellow]Skipping tests for [bold]#{provider}[/] [yellow]due to lacking credentials (add some to '#{Fog.credentials_path}' to run them)[/]")
   Thread.current[:tags] << ('-' << provider)
 end