diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
index eaa1bc32f3cf4f2ca0f509c833c9672ee0bf648d..50e813f6784f8b1ff1b6f127726d7c54a126f123 100644
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverRepositoryTest.java
@@ -32,7 +32,7 @@ class DriverRepositoryTest {
     Driver savedDriver = driverRepository.save(driver);
 
     Assertions.assertEquals(savedDriver, driver);
-    Assertions.assertEquals(entityManager.find(Driver.class, 1L).getId(), 1);
+    Assertions.assertEquals(entityManager.find(Driver.class, savedDriver.getId()), savedDriver);
   }
 
   @Test
@@ -59,6 +59,8 @@ class DriverRepositoryTest {
         () -> Assertions.assertNotEquals(original.getSurname(), updatedDriver.getSurname()),
         () -> Assertions.assertNotEquals(original.getNationality(), updatedDriver.getNationality())
     );
+    Assertions.assertEquals(entityManager.find(Driver.class, savedDriver.getId()), savedDriver);
+
   }
 
   @Test
@@ -90,15 +92,18 @@ class DriverRepositoryTest {
         .characteristics(Map.of()).build();
 
     Driver driver2 = Driver.builder()
-        .name("Name")
-        .surname("Surname")
-        .nationality("Nationality")
+        .name("Name2")
+        .surname("Surname2")
+        .nationality("Nationality2")
         .characteristics(Map.of()).build();
 
-    driverRepository.save(driver);
-    driverRepository.save(driver2);
+    var savedDriver1 = driverRepository.save(driver);
+    var savedDriver2 = driverRepository.save(driver2);
 
     var savedDrivers = driverRepository.findAll();
     Assertions.assertEquals(2, savedDrivers.size());
+
+    Assertions.assertEquals(entityManager.find(Driver.class, savedDriver1.getId()), savedDriver1);
+    Assertions.assertEquals(entityManager.find(Driver.class, savedDriver2.getId()), savedDriver2);
   }
 }
diff --git a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java
index 9fa615fa939d9c1f5c69e9e58d3e8f91cb0b18c3..17636a80e5c0aa5660252912ab4028d0c41d630f 100644
--- a/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java
+++ b/driver/src/test/java/cz/muni/pa165/driver/rest/DriverTestUtil.java
@@ -17,9 +17,8 @@ public class DriverTestUtil {
    * @return add driver dto object.
    */
   public static DriverAddDto getAddDriver() {
-    var driver = new DriverAddDto("Name",
+    return new DriverAddDto("Name",
         "Surname", "Nationality", new HashMap<>());
-    return driver;
   }
 
   /**