diff --git a/server/tests/setup.js b/server/tests/setup.js
index f80071b..90e0c84 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -121,12 +121,18 @@ async function createTestUser(userData = {}) {
   // Create default tenant if not exists
   let tenant = await Tenant.findOne({ where: { slug: 'test-tenant' } });
   if (!tenant) {
-    tenant = await Tenant.create({
-      name: 'Test Tenant',
-      slug: 'test-tenant',
-      domain: 'test.example.com',
-      is_active: true
-    });
+    try {
+      tenant = await Tenant.create({
+        name: 'Test Tenant',
+        slug: 'test-tenant',
+        domain: 'test.example.com',
+        is_active: true
+      });
+    } catch (error) {
+      console.error('❌ Default tenant creation failed:', error.message);
+      console.error('❌ Validation errors:', error.errors);
+      throw error;
+    }
   }
   
   // Generate a unique username to avoid conflicts
@@ -222,7 +228,14 @@ async function createTestTenant(tenantData = {}) {
     ...tenantData
   };
   
-  return await Tenant.create(defaultTenantData);
+  try {
+    return await Tenant.create(defaultTenantData);
+  } catch (error) {
+    console.error('❌ Tenant creation failed:', error.message);
+    console.error('❌ Validation errors:', error.errors);
+    console.error('❌ Tenant data:', defaultTenantData);
+    throw error;
+  }
 }
 
 /**