diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb
index 196229a91..913f64962 100644
--- a/tests/compute/helper.rb
+++ b/tests/compute/helper.rb
@@ -32,8 +32,8 @@ def compute_providers
         :cloudstack_host => 'http://host.foo'
       },
       :server_attributes => {}.tap do |hash|
-        [:zone_id, :network_ids, :image_id, :flavor_id].each do |k|
-          hash[k]= Fog.credentials[:cloudstack] && Fog.credentials[:cloudstack][k]
+        [:zone_id, :network_ids, :template_id, :service_offering_id].each do |k|
+          hash[k]= Fog.credentials["cloudstack_#{k}".to_sym]
         end
       end,
       :volume_attributes => {:name => "somevolume"}.tap do |hash|
diff --git a/tests/helpers/mock_helper.rb b/tests/helpers/mock_helper.rb
index d999e85ce..087356fc0 100644
--- a/tests/helpers/mock_helper.rb
+++ b/tests/helpers/mock_helper.rb
@@ -16,6 +16,9 @@ if Fog.mock?
     :brightbox_client_id              => 'brightbox_client_id',
     :brightbox_secret                 => 'brightbox_secret',
     :cloudstack_host                  => 'http://cloudstack.example.org',
+    :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',
     :clodo_username                   => 'clodo_username',
     :dnsimple_email                   => 'dnsimple_email',