diff --git a/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs b/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs
index c280cd6..4942c35 100644
--- a/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs
+++ b/tests/Berufsschule_HAM.E2ETests/GroupsPageTests.cs
@@ -43,12 +43,14 @@ public class GroupsPageTests : IDisposable
     [Fact]
     public void GroupsPage_ShouldCreateAndUpdateAndDeleteGroup()
     {
+        string randomName = $"RESERVED_TEST_{AppHelper.GetRandomName()}";
+        string randomName2 = $"RESERVED_TEST_{AppHelper.GetRandomName()}";
         AppHelper.Login(_driver);
         GroupsHelper.NavigateToGroupsPage(_driver);
-        GroupsHelper.CreateGroup(_driver, "RESERVED_TEST", "TEST GROUP", true, true, true, true, true, true);
-        GroupsHelper.UpdateGroup(_driver, "RESERVED_TEST", "RESERVED_TEST2", "TEST GROUP", false, false, false, false, false, false);
-        GroupsHelper.UpdateGroup(_driver, "RESERVED_TEST2", "RESERVED_TEST", "TEST GROUP", true, true, true, true, true, true);
-        GroupsHelper.DeleteGroup(_driver, "RESERVED_TEST");
+        GroupsHelper.CreateGroup(_driver, randomName, "TEST GROUP", true, true, true, true, true, true);
+        GroupsHelper.UpdateGroup(_driver, randomName, randomName2, "TEST GROUP", false, false, false, false, false, false);
+        GroupsHelper.UpdateGroup(_driver, randomName2, randomName, "TEST GROUP", true, true, true, true, true, true);
+        GroupsHelper.DeleteGroup(_driver, randomName);
     }
     public void Dispose()
     {
diff --git a/tests/Berufsschule_HAM.E2ETests/LocationsPageTests.cs b/tests/Berufsschule_HAM.E2ETests/LocationsPageTests.cs
index 4347766..8d25d36 100644
--- a/tests/Berufsschule_HAM.E2ETests/LocationsPageTests.cs
+++ b/tests/Berufsschule_HAM.E2ETests/LocationsPageTests.cs
@@ -43,11 +43,13 @@ public class LocationsPageTests : IDisposable
     [Fact]
     public void LocationsPage_ShouldCreateAndUpdateAndDeleteGroup()
     {
+        string randomName = $"RESERVED_LOCATION_{AppHelper.GetRandomName()}";
+        string randomName2 = $"RESERVED_LOCATION_{AppHelper.GetRandomName()}";
         AppHelper.Login(_driver);
         LocationsHelper.NavigateToLocationsPage(_driver);
-        LocationsHelper.CreateLocation(_driver, "RESERVED_LOCATION", "RESERVED_ROOM", "RESERVED_ROOMNUMBER");
-        LocationsHelper.UpdateLocation(_driver, "RESERVED_LOCATION", "RESERVED_ROOM", "RESERVED_ROOMNUMBER", "RESERVED_LOCATION2", "RESERVED_ROOM2", "RESERVED_ROOMNUMBER2");
-        LocationsHelper.UpdateLocation(_driver, "RESERVED_LOCATION2", "RESERVED_ROOM2", "RESERVED_ROOMNUMBER2", "RESERVED_LOCATION", "RESERVED_ROOM", "RESERVED_ROOMNUMBER");
+        LocationsHelper.CreateLocation(_driver, randomName, "RESERVED_ROOM", "RESERVED_ROOMNUMBER");
+        LocationsHelper.UpdateLocation(_driver, randomName, "RESERVED_ROOM", "RESERVED_ROOMNUMBER", randomName2, "RESERVED_ROOM2", "RESERVED_ROOMNUMBER2");
+        LocationsHelper.UpdateLocation(_driver, randomName2, "RESERVED_ROOM2", "RESERVED_ROOMNUMBER2", randomName, "RESERVED_ROOM", "RESERVED_ROOMNUMBER");
         LocationsHelper.DeleteLocation(_driver, "reservedlocation-reservedroom-reservedroomnumber");
     }
     public void Dispose()