diff --git a/server/tests/setup.js b/server/tests/setup.js
index 6387167..4bd8db1 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -177,7 +177,6 @@ async function createTestDevice(deviceData = {}) {
   }
   
   const defaultDeviceData = {
-    id: Math.floor(Math.random() * 1000000000),
     name: 'Test Device',
     geo_lat: 59.3293,
     geo_lon: 18.0686,
@@ -187,8 +186,18 @@ async function createTestDevice(deviceData = {}) {
     is_approved: true,
     ...deviceData
   };
-  
-  return await Device.create(defaultDeviceData);
+
+  // If a specific ID is provided, use upsert to ensure it's respected
+  if (deviceData.id) {
+    const [device, created] = await Device.upsert(defaultDeviceData, {
+      returning: true
+    });
+    return device;
+  } else {
+    // Auto-generate ID when none provided
+    defaultDeviceData.id = Math.floor(Math.random() * 1000000000);
+    return await Device.create(defaultDeviceData);
+  }
 }
 
 /**