diff --git a/backend/models/model_character_test.go b/backend/models/model_character_test.go
index 0843e99..50cf5a3 100644
--- a/backend/models/model_character_test.go
+++ b/backend/models/model_character_test.go
@@ -16,6 +16,15 @@ func setupCharacterTestDB(t *testing.T) {
 	// Migrate structures
 	err := MigrateStructure()
 	require.NoError(t, err, "Failed to migrate database structure")
+	
+	// Clean up any existing test data
+	cleanupCharacterTestData(t)
+}
+
+func cleanupCharacterTestData(t *testing.T) {
+	// Delete all characters to ensure clean state
+	err := database.DB.Exec("DELETE FROM char_chars").Error
+	require.NoError(t, err, "Failed to clean up characters")
 }
 
 func createTestUser() *user.User {
diff --git a/backend/models/model_equipment_test.go b/backend/models/model_equipment_test.go
index 17f8b79..eda1192 100644
--- a/backend/models/model_equipment_test.go
+++ b/backend/models/model_equipment_test.go
@@ -15,6 +15,22 @@ func setupEquipmentTestDB(t *testing.T) {
 	// Migrate structures
 	err := MigrateStructure()
 	require.NoError(t, err, "Failed to migrate database structure")
+	
+	// Clean up any existing test data
+	cleanupEquipmentTestData(t)
+}
+
+func cleanupEquipmentTestData(t *testing.T) {
+	// Delete all equipment data to ensure clean state
+	// Delete from actual equipment tables that exist
+	err := database.DB.Exec("DELETE FROM equi_containers").Error
+	require.NoError(t, err, "Failed to clean up equipment containers")
+	
+	err = database.DB.Exec("DELETE FROM equi_weapons").Error
+	require.NoError(t, err, "Failed to clean up equipment weapons")
+	
+	err = database.DB.Exec("DELETE FROM equi_equipments").Error
+	require.NoError(t, err, "Failed to clean up equipment items")
 }
 
 func createTestAusruestung(name string) *EqAusruestung {