diff --git a/tests/rackspace/helper.rb b/tests/rackspace/helper.rb
index 3e45f761f..6319ee98c 100644
--- a/tests/rackspace/helper.rb
+++ b/tests/rackspace/helper.rb
@@ -62,9 +62,10 @@ module Shindo
       sleep 30 unless Fog.mocking?
     end
 
-    def rackspace_test_image_id(service) 
+    def rackspace_test_image_id(service)
+      image_id  = Fog.credentials[:rackspace_image_id]
       # I chose to use the first Ubuntu because it will work with the smallest flavor and it doesn't require a license
-      @image_id ||= Fog.credentials[:rackspace_image_id] || service.images.find {|img| img.name =~ /Ubuntu/ }.id
+      image_id ||= Fog.mocking? ? @service.images.first.id : @service.images.find {|image| image.name =~ /Ubuntu/}.id # use the first Ubuntu image
     end
 
     def rackspace_test_flavor_id(service)
diff --git a/tests/rackspace/requests/compute_v2/address_tests.rb b/tests/rackspace/requests/compute_v2/address_tests.rb
index 153ddd867..361082c48 100644
--- a/tests/rackspace/requests/compute_v2/address_tests.rb
+++ b/tests/rackspace/requests/compute_v2/address_tests.rb
@@ -1,10 +1,12 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | address requests', ['rackspace']) do
 
   @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+  image_id  = rackspace_test_image_id(@service)
+  flavor_id = rackspace_test_flavor_id(@service)
   
   tests('success') do
     unless Fog.mocking?
-      @server = @service.servers.create(:flavor_id => 2, :image_id => "8a3a9f96-b997-46fd-b7a8-a9e740796ffd", :name => "address-tests-#{Time.now.to_i}")
+      @server = @service.servers.create(:flavor_id => flavor_id, :image_id => image_id, :name => "address-tests-#{Time.now.to_i}")
       @server.wait_for { ready? }
       @server_id = @server.id
     else
diff --git a/tests/rackspace/requests/compute_v2/metadata_tests.rb b/tests/rackspace/requests/compute_v2/metadata_tests.rb
index 8621eea2f..1b42cdf1a 100644
--- a/tests/rackspace/requests/compute_v2/metadata_tests.rb
+++ b/tests/rackspace/requests/compute_v2/metadata_tests.rb
@@ -1,6 +1,8 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do
   
   @service = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
+  image_id  = rackspace_test_image_id(@service)
+  flavor_id = rackspace_test_flavor_id(@service)
   
   tests('success') do
     begin
@@ -9,8 +11,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | metadata_tests', ['rackspace']) do
       unless Fog.mocking?
         name = "fog-server-metadata-#{Time.now.to_i}"
         @server = @service.servers.create(:name => name, 
-                                          :flavor_id => 2,
-                                          :image_id => '3afe97b2-26dc-49c5-a2cc-a2fc8d80c001',
+                                          :flavor_id => flavor_id,
+                                          :image_id => image_id,
                                           :metadata => metadata)
         @server.wait_for { ready? }
         
diff --git a/tests/rackspace/requests/compute_v2/server_tests.rb b/tests/rackspace/requests/compute_v2/server_tests.rb
index 284ed8ce1..486d066f8 100644
--- a/tests/rackspace/requests/compute_v2/server_tests.rb
+++ b/tests/rackspace/requests/compute_v2/server_tests.rb
@@ -1,8 +1,5 @@
 Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
   service   = Fog::Compute.new(:provider => 'Rackspace', :version => 'V2')
-  image_id  = Fog.credentials[:rackspace_image_id]
-  image_id ||= Fog.mocking? ? service.images.first.id : service.images.find {|image| image.name =~ /Ubuntu/}.id # use the first Ubuntu image
-  flavor_id = Fog.credentials[:rackspace_flavor_id] || service.flavors.first.id
 
   link_format = {
     'href' => String,
@@ -62,8 +59,8 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
 
     server_id = nil
     server_name = "fog#{Time.now.to_i.to_s}"
-    image_id = image_id
-    flavor_id = flavor_id
+    image_id = rackspace_test_image_id(service)
+    flavor_id = rackspace_test_flavor_id(service)
 
     tests("#create_server(#{server_name}, #{image_id}, #{flavor_id}, 1, 1)").formats(create_server_format) do
       body = service.create_server(server_name, image_id, flavor_id, 1, 1).body
@@ -117,7 +114,7 @@ Shindo.tests('Fog::Compute::RackspaceV2 | server_tests', ['rackspace']) do
     wait_for_server_state(service, server_id, 'ACTIVE', 'ERROR')
 
     tests('#resize_server').succeeds do
-      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[1].id
+      resize_flavor_id = Fog.mocking? ? flavor_id : service.flavors[2].id
       service.resize_server(server_id, resize_flavor_id)
     end
     wait_for_server_state(service, server_id, 'VERIFY_RESIZE', 'ACTIVE')