diff --git a/tests/hp/models/compute_v2/key_pair_tests.rb b/tests/hp/models/compute_v2/key_pair_tests.rb
index 6a347b5fc..436869981 100644
--- a/tests/hp/models/compute_v2/key_pair_tests.rb
+++ b/tests/hp/models/compute_v2/key_pair_tests.rb
@@ -11,7 +11,7 @@ Shindo.tests("Fog::Compute::HPV2 | key_pair model", ['hp', 'v2', 'compute']) do
   tests('new keypair') do
     @keypair = service.key_pairs.create(:name => 'fogtestkey')
 
-    tests('writable?') do
+    test('writable?') do
       @keypair.writable? == true
     end
   end
@@ -20,7 +20,7 @@ Shindo.tests("Fog::Compute::HPV2 | key_pair model", ['hp', 'v2', 'compute']) do
     service.key_pairs.create(:name => 'fogtestkey')
     @keypair = service.key_pairs.get('fogtestkey')
 
-    tests('writable?') do
+    test('writable?') do
       @keypair.writable? == false
     end
   end
diff --git a/tests/hp/models/compute_v2/metadata_image_tests.rb b/tests/hp/models/compute_v2/metadata_image_tests.rb
index 4ecdccccc..66347f47e 100644
--- a/tests/hp/models/compute_v2/metadata_image_tests.rb
+++ b/tests/hp/models/compute_v2/metadata_image_tests.rb
@@ -26,14 +26,14 @@ Shindo.tests("Fog::Compute::HPV2 | metadata for images", ['hp', 'v2', 'compute']
 
     tests("#update({'Meta3' => 'MetaValue3'})").succeeds do
       @data = @image.metadata.update({'Meta3' => 'MetaValue3'})
-      tests('metadata has updated correctly') do
+      test('metadata has updated correctly') do
         @image.metadata.get('Meta3').value == 'MetaValue3'
       end
     end
 
     tests("#set({'Meta4' => 'MetaValue4'})").succeeds do
       @data = @image.metadata.set({'Meta4' => 'MetaValue4'})
-      tests('metadata has set correctly') do
+      test('metadata has set correctly') do
         @image.metadata.get('Meta4').value == 'MetaValue4'
       end
     end
@@ -41,14 +41,14 @@ Shindo.tests("Fog::Compute::HPV2 | metadata for images", ['hp', 'v2', 'compute']
     tests("#save").succeeds do
       m = @image.metadata.new(:key => 'Meta5', :value => 'MetaValue5')
       @data = m.save
-      tests('metadata has saved correctly') do
+      test('metadata has saved correctly') do
         @image.metadata.get('Meta5').value == 'MetaValue5'
       end
     end
 
     tests("#destroy('Meta5')").succeeds do
       @image.metadata.destroy('Meta5')
-      tests('metadata has been destroyed') do
+      test('metadata has been destroyed') do
         @image.metadata.get('Meta5') == nil
       end
     end
diff --git a/tests/hp/models/compute_v2/metadata_server_tests.rb b/tests/hp/models/compute_v2/metadata_server_tests.rb
index fb8bcdda7..c7891a4a1 100644
--- a/tests/hp/models/compute_v2/metadata_server_tests.rb
+++ b/tests/hp/models/compute_v2/metadata_server_tests.rb
@@ -15,21 +15,21 @@ Shindo.tests("Fog::Compute::HPV2 | metadata for servers", ['hp', 'v2', 'compute'
 
     tests("#get('Meta1')").succeeds do
       @data = @server.metadata.get('Meta1')
-      tests('metadata gets correct value') do
+      test('metadata gets correct value') do
         @data.value == 'MetaValue1'
       end
     end
 
     tests("#update({'Meta3' => 'MetaValue3'})").succeeds do
       @data = @server.metadata.update({'Meta3' => 'MetaValue3'})
-      tests('metadata has updated correctly') do
+      test('metadata has updated correctly') do
         @server.metadata.get('Meta3').value == 'MetaValue3'
       end
     end
 
     tests("#set({'Meta4' => 'MetaValue4'})").succeeds do
       @data = @server.metadata.set({'Meta4' => 'MetaValue4'})
-      tests('metadata has set correctly') do
+      test('metadata has set correctly') do
         @server.metadata.get('Meta4').value == 'MetaValue4'
       end
     end
@@ -37,14 +37,14 @@ Shindo.tests("Fog::Compute::HPV2 | metadata for servers", ['hp', 'v2', 'compute'
     tests('#save').succeeds do
       m = @server.metadata.new(:key => 'Meta5', :value => 'MetaValue5')
       @data = m.save
-      tests('metadata has saved correctly') do
+      test('metadata has saved correctly') do
         @server.metadata.get('Meta5').value == 'MetaValue5'
       end
     end
 
     tests("#destroy('Meta5')").succeeds do
       @data = @server.metadata.destroy('Meta5')
-      tests('metadata has been destroyed') do
+      test('metadata has been destroyed') do
         @server.metadata.get('Meta5') == nil
       end
     end
diff --git a/tests/hp/models/compute_v2/server_tests.rb b/tests/hp/models/compute_v2/server_tests.rb
index 79ba704c5..f30f37cb3 100644
--- a/tests/hp/models/compute_v2/server_tests.rb
+++ b/tests/hp/models/compute_v2/server_tests.rb
@@ -8,24 +8,24 @@ Shindo.tests("Fog::Compute::HPV2 | server model", ['hp', 'v2', 'compute']) do
 
     @server = service.servers.create(:name => 'fogservertest', :flavor_id => 100, :image_id => @base_image_id)
 
-    tests('#console_output(10)') do
+    tests('#console_output(10)').succeeds do
       @server.console_output(10)
     end
 
-    tests('#vnc_console_url') do
+    tests('#vnc_console_url').succeeds do
       @server.vnc_console_url
     end
 
-    tests("#create_image('fogimgfromserver')") do
+    tests("#create_image('fogimgfromserver')").succeeds do
       @server.create_image('fogimgfromserver')
     end
 
-    tests("#reboot('SOFT')") do
+    tests("#reboot('SOFT')").succeeds do
       pending unless Fog.mocking?
       @server.reboot('SOFT')
     end
 
-    tests("#rebuild(#{@base_image_id}, 'fogrebuildserver')") do
+    tests("#rebuild(#{@base_image_id}, 'fogrebuildserver')").succeeds do
       pending
       @server.rebuild(@base_image_id, 'fogrebuildserver')
     end