diff --git a/server/tests/setup.js b/server/tests/setup.js
index 5443344..4d9a5c8 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -150,8 +150,8 @@ async function createTestUser(userData = {}) {
   }
   
   const defaultUserData = {
-    username: 'testuser',
-    email: 'test@example.com',
+    username: userData.username || `testuser-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+    email: userData.email || `test-${Date.now()}-${Math.random().toString(36).substr(2, 9)}@example.com`,
     password_hash: '$2b$10$dummyHashForTestingOnly',
     role: 'admin',
     tenant_id: tenant.id,