diff --git a/server/tests/setup.js b/server/tests/setup.js
index 5e9a41e..38b70e5 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -222,10 +222,11 @@ async function createTestDetection(detectionData = {}) {
 async function createTestTenant(tenantData = {}) {
   const { Tenant } = models;
   
+  const timestamp = Date.now();
   const defaultTenantData = {
     name: 'Test Tenant',
-    slug: 'test-tenant-' + Date.now(),
-    domain: 'test.example.com',
+    slug: 'test-tenant-' + timestamp,
+    domain: 'test-' + timestamp + '.example.com',
     is_active: true,
     ...tenantData
   };