diff --git a/tests/ecloud/compute/models/server_tests.rb b/tests/ecloud/compute/models/server_tests.rb
index 7645dbd7c..345548f13 100644
--- a/tests/ecloud/compute/models/server_tests.rb
+++ b/tests/ecloud/compute/models/server_tests.rb
@@ -1,13 +1,13 @@
 provider, config = :ecloud, compute_providers[:ecloud]
-connection   = Fog::Compute[provider]
-organization = connection.organizations.first
-environment  = organization.environments.find{|e| e.name == config[:server_attributes][:environment_name]} || organization.environments.first
-public_ip    = environment.public_ips.first
-compute_pool = environment.compute_pools.first
-image_href   = Fog.credentials[:ecloud_image_href] || compute_pool.templates.first.href
-ssh_key      = organization.admin.ssh_keys.detect { |key| key.name == "root" }
 
 Shindo.tests("Fog::Compute[:#{provider}] | servers", [provider.to_s, "operations"]) do
+  connection   = Fog::Compute[provider]
+  organization = connection.organizations.first
+  environment  = organization.environments.find{|e| e.name == config[:server_attributes][:environment_name]} || organization.environments.first
+  public_ip    = environment.public_ips.first
+  compute_pool = environment.compute_pools.first
+  image_href   = Fog.credentials[:ecloud_image_href] || compute_pool.templates.first.href
+  ssh_key      = organization.admin.ssh_keys.detect { |key| key.name == "root" }
 
   @network = environment.networks.first
   options  = config[:server_attributes].merge(:network_uri => @network.href, :ssh_key_uri => ssh_key.href)