diff --git a/tests/digitalocean/requests/compute/power_state_tests.rb b/tests/digitalocean/requests/compute/power_state_tests.rb
index f062258d5..0275c744a 100644
--- a/tests/digitalocean/requests/compute/power_state_tests.rb
+++ b/tests/digitalocean/requests/compute/power_state_tests.rb
@@ -8,24 +8,17 @@ Shindo.tests('Fog::Compute[:digitalocean] | power on/off/shutdown requests',
 
     test('#power_off_server') do
       server.wait_for(120) { ready? }
-      service.power_off_server(server.id)
-      server.wait_for(120) { !ready? }
-      server.status == 'off'
+      service.power_off_server(server.id).body['status'] == 'OK'
     end
 
     test('#power_on_server') do
-      service.power_on_server server.id
-      server.wait_for(120) { ready? }
-      server.ready?
+      service.power_on_server(server.id).body['status'] == 'OK'
     end
     
     test('#shutdown_server') do
-      service.shutdown_server server.id
-      server.wait_for(120) { !ready? }
-      server.status == 'off'
+      service.shutdown_server(server.id).body['status'] == 'OK'
     end
     
-    # restore status
     server.start
 
   end