diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/BuilderLifecycleCallbacksTest.java b/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/BuilderLifecycleCallbacksTest.java
index 9ef7b2469..890c96da2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/BuilderLifecycleCallbacksTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/BuilderLifecycleCallbacksTest.java
@@ -58,10 +58,13 @@ public class BuilderLifecycleCallbacksTest {
 
         assertThat( context.getInvokedMethods() )
             .contains(
+                "beforeWithoutParameters",
                 "beforeWithBuilderTargetType",
                 "beforeWithBuilderTarget",
+                "afterWithoutParameters",
                 "afterWithBuilderTargetType",
-                "afterWithBuilderTarget"
+                "afterWithBuilderTarget",
+                "afterWithBuilderTargetReturningTarget"
             );
     }
 }
diff --git a/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/MappingContext.java b/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/MappingContext.java
index 5b4f6487f..157b5bbce 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/MappingContext.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/builder/lifecycle/MappingContext.java
@@ -33,6 +33,11 @@ public class MappingContext {
 
     private final List<String> invokedMethods = new ArrayList<String>();
 
+    @BeforeMapping
+    public void beforeWithoutParameters() {
+        invokedMethods.add( "beforeWithoutParameters" );
+    }
+
     @BeforeMapping
     public void beforeWithTargetType(OrderDto source, @TargetType Class<Order> orderClass) {
         invokedMethods.add( "beforeWithTargetType" );
@@ -53,6 +58,11 @@ public class MappingContext {
         invokedMethods.add( "beforeWithBuilderTarget" );
     }
 
+    @AfterMapping
+    public void afterWithoutParameters() {
+        invokedMethods.add( "afterWithoutParameters" );
+    }
+
     @AfterMapping
     public void afterWithTargetType(OrderDto source, @TargetType Class<Order> orderClass) {
         invokedMethods.add( "afterWithTargetType" );
@@ -73,6 +83,13 @@ public class MappingContext {
         invokedMethods.add( "afterWithBuilderTarget" );
     }
 
+    @AfterMapping
+    public Order afterWithBuilderTargetReturningTarget(@MappingTarget Order.Builder orderBuilder) {
+        invokedMethods.add( "afterWithBuilderTargetReturningTarget" );
+
+        return orderBuilder.create();
+    }
+
     public List<String> getInvokedMethods() {
         return invokedMethods;
     }