diff --git a/tests/aws/models/storage/directory_tests.rb b/tests/aws/models/storage/directory_tests.rb
index 2ce31d721..fb7dd628d 100644
--- a/tests/aws/models/storage/directory_tests.rb
+++ b/tests/aws/models/storage/directory_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | directory", [:aws]) do
+Shindo.tests("Storage[:aws] | directory", ["aws"]) do
 
   directory_attributes = {
     :key => 'fogdirectorytests'
diff --git a/tests/aws/models/storage/file_tests.rb b/tests/aws/models/storage/file_tests.rb
index 3ce6d05ae..6ae898e40 100644
--- a/tests/aws/models/storage/file_tests.rb
+++ b/tests/aws/models/storage/file_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | file", [:aws]) do
+Shindo.tests("Storage[:aws] | file", ["aws"]) do
 
   require 'tempfile'
 
diff --git a/tests/aws/models/storage/files_tests.rb b/tests/aws/models/storage/files_tests.rb
index a5ff3f64c..74e7bd713 100644
--- a/tests/aws/models/storage/files_tests.rb
+++ b/tests/aws/models/storage/files_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | files", [:aws]) do
+Shindo.tests("Storage[:aws] | files", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',
diff --git a/tests/aws/models/storage/version_tests.rb b/tests/aws/models/storage/version_tests.rb
index d42e1d9f2..c1582d34a 100644
--- a/tests/aws/models/storage/version_tests.rb
+++ b/tests/aws/models/storage/version_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | version", [:aws]) do
+Shindo.tests("Storage[:aws] | version", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',
diff --git a/tests/aws/models/storage/versions_tests.rb b/tests/aws/models/storage/versions_tests.rb
index 88bc2df4e..85f8c1dea 100644
--- a/tests/aws/models/storage/versions_tests.rb
+++ b/tests/aws/models/storage/versions_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Storage[:aws] | versions", [:aws]) do
+Shindo.tests("Storage[:aws] | versions", ["aws"]) do
 
   file_attributes = {
       :key => 'fog_file_tests',
diff --git a/tests/aws/requests/storage/acl_utils_tests.rb b/tests/aws/requests/storage/acl_utils_tests.rb
index 84b932596..5df8ce856 100644
--- a/tests/aws/requests/storage/acl_utils_tests.rb
+++ b/tests/aws/requests/storage/acl_utils_tests.rb
@@ -1,6 +1,6 @@
 require 'fog/aws/requests/storage/acl_utils'
 
-Shindo.tests('Fog::Storage::AWS | ACL utils', [:aws]) do
+Shindo.tests('Fog::Storage::AWS | ACL utils', ["aws"]) do
   tests(".hash_to_acl") do
     tests(".hash_to_acl({}) at xpath //AccessControlPolicy").returns("", "has an empty AccessControlPolicy") do
       xml = Fog::Storage::AWS.hash_to_acl({})
diff --git a/tests/aws/requests/storage/bucket_tests.rb b/tests/aws/requests/storage/bucket_tests.rb
index 4850c9394..922085957 100644
--- a/tests/aws/requests/storage/bucket_tests.rb
+++ b/tests/aws/requests/storage/bucket_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:aws] | bucket requests', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | bucket requests', ["aws"]) do
   @aws_bucket_name = 'fogbuckettests-' + Time.now.to_i.to_s(32)
 
   tests('success') do
diff --git a/tests/aws/requests/storage/multipart_upload_tests.rb b/tests/aws/requests/storage/multipart_upload_tests.rb
index 55a39dd8a..953437a4f 100644
--- a/tests/aws/requests/storage/multipart_upload_tests.rb
+++ b/tests/aws/requests/storage/multipart_upload_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:aws] | multipart upload requests', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | multipart upload requests', ["aws"]) do
 
   @directory = Fog::Storage[:aws].directories.create(:key => 'fogmultipartuploadtests')
 
diff --git a/tests/aws/requests/storage/versioning_tests.rb b/tests/aws/requests/storage/versioning_tests.rb
index 89689c854..99dd03adb 100644
--- a/tests/aws/requests/storage/versioning_tests.rb
+++ b/tests/aws/requests/storage/versioning_tests.rb
@@ -20,7 +20,7 @@ def delete_bucket
   Fog::Storage[:aws].delete_bucket(@aws_bucket_name)
 end
 
-Shindo.tests('Fog::Storage[:aws] | versioning', [:aws]) do
+Shindo.tests('Fog::Storage[:aws] | versioning', ["aws"]) do
   tests('success') do
     tests("#put_bucket_versioning") do
       @aws_bucket_name = 'fogbuckettests-' + Fog::Mock.random_hex(16)
diff --git a/tests/cloudstack/compute/models/volume_tests.rb b/tests/cloudstack/compute/models/volume_tests.rb
index 6676860e2..30c284492 100644
--- a/tests/cloudstack/compute/models/volume_tests.rb
+++ b/tests/cloudstack/compute/models/volume_tests.rb
@@ -19,7 +19,7 @@ def volume_tests(connection, params, mocks_implemented = true)
   end
 end
 
-Shindo.tests("Fog::Compute[:cloudstack] | volume", :cloudstack) do
+Shindo.tests("Fog::Compute[:cloudstack] | volume", "cloudstack") do
 
   config = compute_providers[:cloudstack]
 
diff --git a/tests/google/requests/storage/bucket_tests.rb b/tests/google/requests/storage/bucket_tests.rb
index 7c22938f5..ea5439985 100644
--- a/tests/google/requests/storage/bucket_tests.rb
+++ b/tests/google/requests/storage/bucket_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:google] | bucket requests', [:google]) do
+Shindo.tests('Fog::Storage[:google] | bucket requests', ["google"]) do
 
   tests('success') do
 
diff --git a/tests/google/requests/storage/object_tests.rb b/tests/google/requests/storage/object_tests.rb
index 0bca138ef..27086beae 100644
--- a/tests/google/requests/storage/object_tests.rb
+++ b/tests/google/requests/storage/object_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:google] | object requests', [:google]) do
+Shindo.tests('Fog::Storage[:google] | object requests', ["google"]) do
 
   @directory = Fog::Storage[:google].directories.create(:key => 'fogobjecttests')
 
diff --git a/tests/hp/models/compute/address_tests.rb b/tests/hp/models/compute/address_tests.rb
index e93ec347b..9b820ea14 100644
--- a/tests/hp/models/compute/address_tests.rb
+++ b/tests/hp/models/compute/address_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | address", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | address", ["hp"]) do
 
   @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
 
diff --git a/tests/hp/models/compute/addresses_tests.rb b/tests/hp/models/compute/addresses_tests.rb
index 364638dab..a6356e72b 100644
--- a/tests/hp/models/compute/addresses_tests.rb
+++ b/tests/hp/models/compute/addresses_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | addresses", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | addresses", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].addresses, {}, true)
 
diff --git a/tests/hp/models/compute/key_pair_tests.rb b/tests/hp/models/compute/key_pair_tests.rb
index dc87eb596..27cbcc38b 100644
--- a/tests/hp/models/compute/key_pair_tests.rb
+++ b/tests/hp/models/compute/key_pair_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | key_pair", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | key_pair", ["hp"]) do
 
   model_tests(Fog::Compute[:hp].key_pairs, {:name => 'fogkeyname'}, true)
 
diff --git a/tests/hp/models/compute/key_pairs_tests.rb b/tests/hp/models/compute/key_pairs_tests.rb
index 2f4a6d8c0..0eafb52c0 100644
--- a/tests/hp/models/compute/key_pairs_tests.rb
+++ b/tests/hp/models/compute/key_pairs_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | key_pairs", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | key_pairs", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].key_pairs, {:name => 'fogkeyname'}, true)
 
diff --git a/tests/hp/models/compute/security_group_tests.rb b/tests/hp/models/compute/security_group_tests.rb
index 99161be6d..b39972168 100644
--- a/tests/hp/models/compute/security_group_tests.rb
+++ b/tests/hp/models/compute/security_group_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | security_group", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | security_group", ["hp"]) do
 
   model_tests(Fog::Compute[:hp].security_groups, {:name => 'foggroupname', :description => 'foggroupdescription'}, true)
 
diff --git a/tests/hp/models/compute/security_groups_tests.rb b/tests/hp/models/compute/security_groups_tests.rb
index a4146075b..957637f46 100644
--- a/tests/hp/models/compute/security_groups_tests.rb
+++ b/tests/hp/models/compute/security_groups_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests("Fog::Compute[:hp] | security_groups", [:hp]) do
+Shindo.tests("Fog::Compute[:hp] | security_groups", ["hp"]) do
 
   collection_tests(Fog::Compute[:hp].security_groups, {:name => 'foggroupname', :description => 'foggroupdescription'}, true)
 
diff --git a/tests/hp/requests/cdn/container_tests.rb b/tests/hp/requests/cdn/container_tests.rb
index 4b63ff5ad..b3fa6cd9b 100644
--- a/tests/hp/requests/cdn/container_tests.rb
+++ b/tests/hp/requests/cdn/container_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::CDN[:hp] | container requests', [:hp]) do
+Shindo.tests('Fog::CDN[:hp] | container requests', ["hp"]) do
 
   @cdn_containers_format = [{
     'x-cdn-ssl-uri' => String,
diff --git a/tests/hp/requests/compute/address_tests.rb b/tests/hp/requests/compute/address_tests.rb
index 40ae9330d..7ce976a79 100644
--- a/tests/hp/requests/compute/address_tests.rb
+++ b/tests/hp/requests/compute/address_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | address requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | address requests', ["hp"]) do
 
   @floating_ips_format = {
     'instance_id' => Fog::Nullable::Integer,
diff --git a/tests/hp/requests/compute/flavor_tests.rb b/tests/hp/requests/compute/flavor_tests.rb
index cfea5d59e..2bb971ada 100644
--- a/tests/hp/requests/compute/flavor_tests.rb
+++ b/tests/hp/requests/compute/flavor_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | flavor requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | flavor requests', ["hp"]) do
 
   @flavor_format = {
     'rxtx_quota' => Integer,
diff --git a/tests/hp/requests/compute/image_tests.rb b/tests/hp/requests/compute/image_tests.rb
index 2d12b4546..6b7c6ae63 100644
--- a/tests/hp/requests/compute/image_tests.rb
+++ b/tests/hp/requests/compute/image_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | image requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | image requests', ["hp"]) do
 
   @image_format = {
     'id'        => String,
diff --git a/tests/hp/requests/compute/key_pair_tests.rb b/tests/hp/requests/compute/key_pair_tests.rb
index a58e6b735..4a3bdfffd 100644
--- a/tests/hp/requests/compute/key_pair_tests.rb
+++ b/tests/hp/requests/compute/key_pair_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | key pair requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | key pair requests', ["hp"]) do
 
   tests('success') do
 
diff --git a/tests/hp/requests/compute/security_group_rule_tests.rb b/tests/hp/requests/compute/security_group_rule_tests.rb
index b6172236d..0135448fa 100644
--- a/tests/hp/requests/compute/security_group_rule_tests.rb
+++ b/tests/hp/requests/compute/security_group_rule_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | security group requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | security group requests', ["hp"]) do
 
   @security_group_rule_format = {
     'from_port'       => Integer,
diff --git a/tests/hp/requests/compute/security_group_tests.rb b/tests/hp/requests/compute/security_group_tests.rb
index dc668fa91..a4fd021c5 100644
--- a/tests/hp/requests/compute/security_group_tests.rb
+++ b/tests/hp/requests/compute/security_group_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | security group requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | security group requests', ["hp"]) do
 
   @security_groups_format = {
     'security_groups' => [{
diff --git a/tests/hp/requests/compute/server_address_tests.rb b/tests/hp/requests/compute/server_address_tests.rb
index 672cd75e8..d35d15b2d 100644
--- a/tests/hp/requests/compute/server_address_tests.rb
+++ b/tests/hp/requests/compute/server_address_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | address requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | address requests', ["hp"]) do
 
   @base_image_id = ENV["BASE_IMAGE_ID"] || 1242
 
diff --git a/tests/hp/requests/compute/server_tests.rb b/tests/hp/requests/compute/server_tests.rb
index b774971d9..0186c5a77 100644
--- a/tests/hp/requests/compute/server_tests.rb
+++ b/tests/hp/requests/compute/server_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Compute[:hp] | server requests', [:hp]) do
+Shindo.tests('Fog::Compute[:hp] | server requests', ["hp"]) do
 
   @server_format = {
     'addresses'   => Fog::Nullable::Hash,
diff --git a/tests/hp/requests/storage/container_tests.rb b/tests/hp/requests/storage/container_tests.rb
index 76651c395..860253ae7 100644
--- a/tests/hp/requests/storage/container_tests.rb
+++ b/tests/hp/requests/storage/container_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:hp] | container requests', [:hp]) do
+Shindo.tests('Fog::Storage[:hp] | container requests', ["hp"]) do
 
   @container_format = [String]
 
diff --git a/tests/hp/requests/storage/object_tests.rb b/tests/hp/requests/storage/object_tests.rb
index c228f9180..c440d26ab 100644
--- a/tests/hp/requests/storage/object_tests.rb
+++ b/tests/hp/requests/storage/object_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:hp] | object requests', [:hp]) do
+Shindo.tests('Fog::Storage[:hp] | object requests', ["hp"]) do
 
   @directory = Fog::Storage[:hp].directories.create(:key => 'fogobjecttests')
   @dir_name = @directory.identity
diff --git a/tests/local/models/file_tests.rb b/tests/local/models/file_tests.rb
index 7a34c1c20..5867ae626 100644
--- a/tests/local/models/file_tests.rb
+++ b/tests/local/models/file_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Storage[:local] | file', [:local]) do
+Shindo.tests('Storage[:local] | file', ["local"]) do
 
   pending if Fog.mocking?
 
diff --git a/tests/rackspace/requests/storage/account_tests.rb b/tests/rackspace/requests/storage/account_tests.rb
index 980cd2e74..da69e7f6e 100644
--- a/tests/rackspace/requests/storage/account_tests.rb
+++ b/tests/rackspace/requests/storage/account_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:rackspace] | account requests', [:rackspace]) do
+Shindo.tests('Fog::Storage[:rackspace] | account requests', ["rackspace"]) do
 
   tests('success') do
 
diff --git a/tests/rackspace/requests/storage/container_tests.rb b/tests/rackspace/requests/storage/container_tests.rb
index 2c2b60233..93168bfaa 100644
--- a/tests/rackspace/requests/storage/container_tests.rb
+++ b/tests/rackspace/requests/storage/container_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:rackspace] | container requests', [:rackspace]) do
+Shindo.tests('Fog::Storage[:rackspace] | container requests', ["rackspace"]) do
 
   @container_format = [String]
 
diff --git a/tests/rackspace/requests/storage/large_object_tests.rb b/tests/rackspace/requests/storage/large_object_tests.rb
index 37e10cdfc..4c0239d16 100644
--- a/tests/rackspace/requests/storage/large_object_tests.rb
+++ b/tests/rackspace/requests/storage/large_object_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:rackspace] | large object requests', [:rackspace]) do
+Shindo.tests('Fog::Storage[:rackspace] | large object requests', ["rackspace"]) do
 
   unless Fog.mocking?
     @directory = Fog::Storage[:rackspace].directories.create(:key => 'foglargeobjecttests')
diff --git a/tests/rackspace/requests/storage/object_tests.rb b/tests/rackspace/requests/storage/object_tests.rb
index 85f466fdc..02986a49c 100644
--- a/tests/rackspace/requests/storage/object_tests.rb
+++ b/tests/rackspace/requests/storage/object_tests.rb
@@ -1,4 +1,4 @@
-Shindo.tests('Fog::Storage[:rackspace] | object requests', [:rackspace]) do
+Shindo.tests('Fog::Storage[:rackspace] | object requests', ["rackspace"]) do
 
   unless Fog.mocking?
     @directory = Fog::Storage[:rackspace].directories.create(:key => 'fogobjecttests')