diff --git a/server/tests/setup.js b/server/tests/setup.js
index 449d081..f6c3925 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -294,7 +294,14 @@ async function createTestTenant(tenantData = {}) {
   });
   
   try {
-    return await Tenant.create(defaultTenantData);
+    console.log('🔍 Creating tenant with data:', JSON.stringify(defaultTenantData, null, 2));
+    console.log('🔍 Data types:', Object.keys(defaultTenantData).map(key => `${key}: ${typeof defaultTenantData[key]}`));
+    
+    // Try manual UUID generation as a workaround
+    const { v4: uuidv4 } = require('uuid');
+    const tenantWithId = { ...defaultTenantData, id: uuidv4() };
+    
+    return await Tenant.create(tenantWithId);
   } catch (error) {
     console.error('❌ Tenant creation failed:', error.message);
     console.error('❌ Validation errors:', error.errors);