diff --git a/tests/cloudstack/requests/volume_tests.rb b/tests/cloudstack/requests/volume_tests.rb
index 793c84b31..faccbeafb 100644
--- a/tests/cloudstack/requests/volume_tests.rb
+++ b/tests/cloudstack/requests/volume_tests.rb
@@ -45,4 +45,4 @@ Shindo.tests('Fog::Compute[:cloudstack] | volume requests', ['cloudstack']) do
 
   end
 
-end
\ No newline at end of file
+end
diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb
index eec88af33..7609344d7 100644
--- a/tests/compute/helper.rb
+++ b/tests/compute/helper.rb
@@ -33,12 +33,18 @@ def compute_providers
       },
       :server_attributes => {}.tap do |hash|
         [:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
-          hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
+          key = "cloudstack_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
         end
       end,
       :volume_attributes => {:name => "somevolume"}.tap do |hash|
         [:zone_id, :disk_offering_id].each do |k|
-          hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
+          key = "cloudstack_#{k}".to_sym
+          if Fog.credentials[key]
+            hash[k]= Fog.credentials[key]
+          end
         end
       end,
       :security_group_attributes => {:name => "cloudstack.sg.#{Time.now.to_i}"},
@@ -53,7 +59,7 @@ def compute_providers
     :glesys   => {
       :server_attributes => {
         :rootpassword  => "secret_password_#{Time.now.to_i}",
-        :hostname      => "fog.example#{Time.now.to_i}.com"
+       :hostname      => "fog.example#{Time.now.to_i}.com"
       },
       :mocked => false
     },
diff --git a/tests/helpers/mock_helper.rb b/tests/helpers/mock_helper.rb
index 087356fc0..57a8bf0ae 100644
--- a/tests/helpers/mock_helper.rb
+++ b/tests/helpers/mock_helper.rb
@@ -15,8 +15,10 @@ if Fog.mock?
     :bluebox_customer_id              => 'bluebox_customer_id',
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
+    :cloudstack_disk_offering_id      => '',
     :cloudstack_host                  => 'http://cloudstack.example.org',
-    :cloudstack_service_offering_id     => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
+    :cloudstack_network_ids           => '',
+    :cloudstack_service_offering_id   => '4437ac6c-9fe3-477a-57ec-60a5a45896a4',
     :cloudstack_template_id           => '8a31cf9c-f248-0588-256e-9dbf58785216',
     :cloudstack_zone_id               => 'c554c592-e09c-9df5-7688-4a32754a4305',
     :clodo_api_key                    => 'clodo_api_key',