diff --git a/server/tests/setup.js b/server/tests/setup.js
index 1d0ccb7..82d5977 100644
--- a/server/tests/setup.js
+++ b/server/tests/setup.js
@@ -118,9 +118,6 @@ async function cleanDatabase() {
       // Re-enable foreign key checks
       await sequelize.query('PRAGMA foreign_keys = ON');
       
-      // Reset test counter to ensure fresh unique IDs
-      testCounter = 0;
-      
       console.log('✅ Database cleaned successfully');
     } catch (error) {
       console.error('❌ Database cleanup failed:', error.message);
@@ -137,7 +134,7 @@ let testCounter = 0;
  */
 function getUniqueTestSuffix() {
   testCounter++;
-  return Date.now() + '-' + testCounter + '-' + Math.random().toString(36).substr(2, 5);
+  return Date.now() + '-' + testCounter + '-' + Math.random().toString(36).substr(2, 9) + '-' + process.hrtime.bigint().toString(36);
 }
 
 /**