diff --git a/tests/aws/models/storage/file_tests.rb b/tests/aws/models/storage/file_tests.rb
index 07006468d..2e0ab7e08 100644
--- a/tests/aws/models/storage/file_tests.rb
+++ b/tests/aws/models/storage/file_tests.rb
@@ -7,7 +7,8 @@ Shindo.tests("Storage[:aws] | file", [:aws]) do
   }
 
   directory_attributes = {
-    :key => 'fogfilestests'
+    # Add a random suffix to prevent collision
+    :key => "fogfilestests-#{rand(65536)}"
   }
 
   @directory = Fog::Storage[:aws].directories.create(directory_attributes)