diff --git a/tests/joyent/requests/compute/datasets_test.rb b/tests/joyent/requests/compute/datasets_tests.rb
similarity index 98%
rename from tests/joyent/requests/compute/datasets_test.rb
rename to tests/joyent/requests/compute/datasets_tests.rb
index ceef33a26..01ec07445 100644
--- a/tests/joyent/requests/compute/datasets_test.rb
+++ b/tests/joyent/requests/compute/datasets_tests.rb
@@ -7,7 +7,7 @@ Shindo.tests("Fog::Compute[:joyent] | dataset requests", ["joyent"]) do
     "urn" => String,
     "default" => Fog::Boolean,
     "type" => String,
-    "created" => Time
+    "created" => String
   }
 
   if Fog.mock?
diff --git a/tests/joyent/requests/compute/keys_test.rb b/tests/joyent/requests/compute/keys_tests.rb
similarity index 100%
rename from tests/joyent/requests/compute/keys_test.rb
rename to tests/joyent/requests/compute/keys_tests.rb
diff --git a/tests/joyent/requests/compute/machines_test.rb b/tests/joyent/requests/compute/machines_tests.rb
similarity index 100%
rename from tests/joyent/requests/compute/machines_test.rb
rename to tests/joyent/requests/compute/machines_tests.rb
diff --git a/tests/joyent/requests/compute/packages_test.rb b/tests/joyent/requests/compute/packages_tests.rb
similarity index 100%
rename from tests/joyent/requests/compute/packages_test.rb
rename to tests/joyent/requests/compute/packages_tests.rb