diff --git a/tests/compute/helper.rb b/tests/compute/helper.rb
index <HASH>..<HASH> 100644
--- a/tests/compute/helper.rb
+++ b/tests/compute/helper.rb
@@ -1,9 +1,7 @@
 def compute_providers
   {
     AWS       => {
-      :server_attributes => {
-        :image_id => 'ami-1a837773' # image ami-1a837773 = Ubuntu
-      },
+      :server_attributes => {},
       :mocked => true
     },
     Bluebox   => {
diff --git a/tests/helpers/compute/server_helper.rb b/tests/helpers/compute/server_helper.rb
index <HASH>..<HASH> 100644
--- a/tests/helpers/compute/server_helper.rb
+++ b/tests/helpers/compute/server_helper.rb
@@ -2,6 +2,11 @@ def server_tests(connection, params = {}, mocks_implemented = true)
 
   model_tests(connection.servers, params, mocks_implemented) do
 
+    tests('#reload').returns(true) do
+      identity = @instance.identity
+      !identity.nil? && identity == @instance.reload.identity
+    end
+
     responds_to([:ready?, :state])
 
     tests('#reboot').succeeds do
[compute] Test server reloading.

Also make AWS server tests use default options.