diff --git a/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt b/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt
index b9b4e07c13..23c289ab5a 100644
--- a/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt
+++ b/backend/app/src/test/kotlin/io/tolgee/batch/AbstractBatchJobsGeneralTest.kt
@@ -27,7 +27,7 @@ import org.mockito.ArgumentMatchers.eq
 import org.mockito.Mockito
 import org.mockito.kotlin.any
 import org.mockito.kotlin.argThat
-import org.mockito.kotlin.timeout
+import org.mockito.kotlin.atLeast
 import org.mockito.kotlin.times
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
@@ -121,7 +121,7 @@ abstract class AbstractBatchJobsGeneralTest : AbstractSpringTest() {
       ).process(any(), any(), any(), any())
     }
 
-    job.waitForCompleted().assert.isEqualTo(BatchJobStatus.SUCCESS)
+    job.waitForCompleted().status.assert.isEqualTo(BatchJobStatus.SUCCESS)
 
     // 100 progress messages + 1 finish message
     websocketHelper.receivedMessages.assert.hasSize(101)
@@ -292,7 +292,7 @@ abstract class AbstractBatchJobsGeneralTest : AbstractSpringTest() {
 
     val job = runSingleChunkJob(100)
 
-    job.waitForCompleted().assert.isEqualTo(BatchJobStatus.SUCCESS)
+    job.waitForCompleted().status.assert.isEqualTo(BatchJobStatus.SUCCESS)
 
     waitForNotThrowing(pollTime = 1000) {
       entityManager.createQuery("""from BatchJobChunkExecution b where b.batchJob.id = :id""")
@@ -360,9 +360,11 @@ abstract class AbstractBatchJobsGeneralTest : AbstractSpringTest() {
 
     batchJobChunkExecutionQueue.addToQueue(listOf(secondExecution))
 
-    // it tries to lock the second job but it can't since the first job is locked
-    verify(batchJobProjectLockingManager, timeout(1000))
-      .canRunBatchJobOfExecution(eq(job2.id))
+    waitForNotThrowing {
+      // it tries to lock the second job but it can't since the first job is locked
+      verify(batchJobProjectLockingManager, atLeast(1))
+        .canRunBatchJobOfExecution(eq(job2.id))
+    }
 
     // it doesn't run the second execution since the first job is locked
     Thread.sleep(1000)