diff --git a/server/tests/setup.js b/server/tests/setup.js
index 82d5977..e038896 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -177,6 +177,9 @@ async function createTestUser(userData = {}) {
     ...userData
   };
   
+  // Remove any id field to let Sequelize auto-generate UUID
+  delete defaultUserData.id;
+  
   return await User.create(defaultUserData);
 }
 
@@ -205,7 +208,6 @@ async function createTestDevice(deviceData = {}) {
   }
   
   const defaultDeviceData = {
-    id: Math.floor(Math.random() * 1000000000),
     name: 'Test Device',
     geo_lat: 59.3293,
     geo_lon: 18.0686,
@@ -216,6 +218,9 @@ async function createTestDevice(deviceData = {}) {
     ...deviceData
   };
   
+  // Remove any id field to let Sequelize auto-generate (for Device it's auto-increment)
+  delete defaultDeviceData.id;
+  
   return await Device.create(defaultDeviceData);
 }
 
@@ -266,6 +271,9 @@ async function createTestTenant(tenantData = {}) {
     ...tenantData
   };
   
+  // Remove any id field to let Sequelize auto-generate UUID
+  delete defaultTenantData.id;
+  
   try {
     return await Tenant.create(defaultTenantData);
   } catch (error) {