diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
index 1e637bcf67..128fad10d6 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/plan/BuildPlan.java
@@ -256,14 +256,14 @@ else if ( fork instanceof List )
                 {
                     bindings.add( StateManagementUtils.createStartForkedExecutionMojoBinding() );
                     bindings.addAll( forkedBindings );
-                    bindings.add( StateManagementUtils.createClearForkedExecutionMojoBinding() );
+                    bindings.add( StateManagementUtils.createEndForkedExecutionMojoBinding() );
                 }
 
                 bindings.add( mojoBinding );
 
                 if ( !forkedBindings.isEmpty() )
                 {
-                    bindings.add( StateManagementUtils.createEndForkedExecutionMojoBinding() );
+                    bindings.add( StateManagementUtils.createClearForkedExecutionMojoBinding() );
                 }
             }
             else
diff --git a/maven-core/src/test/java/org/apache/maven/lifecycle/plan/BuildPlanTest.java b/maven-core/src/test/java/org/apache/maven/lifecycle/plan/BuildPlanTest.java
index 5744176421..6907874294 100644
--- a/maven-core/src/test/java/org/apache/maven/lifecycle/plan/BuildPlanTest.java
+++ b/maven-core/src/test/java/org/apache/maven/lifecycle/plan/BuildPlanTest.java
@@ -45,7 +45,7 @@ public void testRender_OneDirectInvocationWithForkedPhase_NoLifecycleOverlay()
 
         check.add( mb );
 
-        check.add( StateManagementUtils.createClearForkedExecutionMojoBinding() );
+        check.add( StateManagementUtils.createEndForkedExecutionMojoBinding() );
 
         binding.getGenerateSources().addBinding( mb );
 
@@ -62,7 +62,7 @@ public void testRender_OneDirectInvocationWithForkedPhase_NoLifecycleOverlay()
 
         check.add( eclipseBinding );
 
-        check.add( StateManagementUtils.createEndForkedExecutionMojoBinding() );
+        check.add( StateManagementUtils.createClearForkedExecutionMojoBinding() );
 
         BuildPlan plan = new BuildPlan( new LifecycleBindings(), tasks );