diff --git a/tests/hp/block_storage_tests.rb b/tests/hp/block_storage_tests.rb
index 8ce150718..e28508512 100644
--- a/tests/hp/block_storage_tests.rb
+++ b/tests/hp/block_storage_tests.rb
@@ -1,6 +1,6 @@
 require 'date'
 
-Shindo.tests('Fog::HP::BlockStorage', ['hp']) do
+Shindo.tests('Fog::HP::BlockStorage', ['hp', 'blockstorage']) do
   credentials = {
     :auth_token => 'auth_token',
     :endpoint_url => 'http://127.0.0.1:0/path/',
@@ -26,4 +26,8 @@ Shindo.tests('Fog::HP::BlockStorage', ['hp']) do
     credentials[:expires] = nil
     raises(Excon::Errors::SocketError) { Fog::HP::BlockStorage::Real.new(options) }
   end
+  tests('Test no creds') do
+    options[:credentials] = nil
+    raises(Excon::Errors::SocketError) { Fog::HP::BlockStorage::Real.new(options) }
+  end
 end
diff --git a/tests/hp/cdn_tests.rb b/tests/hp/cdn_tests.rb
index 310498fa1..19f816ad4 100644
--- a/tests/hp/cdn_tests.rb
+++ b/tests/hp/cdn_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::CDN::HP', ['hp']) do
+Shindo.tests('Fog::CDN::HP', ['hp', 'cdn']) do
   credentials = {
     :auth_token => 'auth_token',
     :endpoint_url => 'http://127.0.0.1/cdnpath/',
diff --git a/tests/hp/compute_tests.rb b/tests/hp/compute_tests.rb
index 1355fb5ca..123c04f4b 100644
--- a/tests/hp/compute_tests.rb
+++ b/tests/hp/compute_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute::HP', ['hp']) do
+Shindo.tests('Fog::Compute::HP', ['hp', 'compute']) do
   credentials = {
     :auth_token => 'auth_token',
     :endpoint_url => 'http://127.0.0.1/computepath/',
diff --git a/tests/hp/storage_tests.rb b/tests/hp/storage_tests.rb
index 8acc44eb3..86a0dd2ad 100644
--- a/tests/hp/storage_tests.rb
+++ b/tests/hp/storage_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage::HP', ['hp']) do
+Shindo.tests('Fog::Storage::HP', ['hp', 'storage']) do
   credentials = {
     :auth_token => 'auth_token',
     :endpoint_url => 'http://127.0.0.1/path/',