diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java
index 2ffabd6fe1..9be173e41b 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java
@@ -101,7 +101,7 @@ public void schedulesAnEventRetryOnException() {
   }
 
   @Test
-  public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
+  public void executesTheControllerInstantlyAfterErrorIfNewEventsReceived() {
     Event event = prepareCREvent();
     TestCustomResource customResource = testCustomResource();
     overrideData(event.getRelatedCustomResourceID(), customResource);
@@ -114,7 +114,7 @@ public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
 
     // start processing an event
     defaultEventHandlerWithRetry.handleEvent(event);
-    // buffer another event
+    // handle another event
     defaultEventHandlerWithRetry.handleEvent(event);
 
     ArgumentCaptor<ExecutionScope> executionScopeArgumentCaptor =
@@ -180,7 +180,7 @@ public void scheduleTimedEventIfInstructedByPostExecutionControl() {
   }
 
   @Test
-  public void reScheduleOnlyIfNotExecutedBufferedEvents() {
+  public void reScheduleOnlyIfNotExecutedEventsReceivedMeanwhile() {
     var testDelay = 10000L;
     when(eventDispatcherMock.handleExecution(any()))
         .thenReturn(PostExecutionControl.defaultDispatch().withReSchedule(testDelay));