diff --git a/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java b/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java
index d6dd49bcfba..585360567e1 100644
--- a/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java
+++ b/beacon/validator/src/test/java/tech/pegasys/teku/validator/coordinator/AbstractBlockFactoryTest.java
@@ -253,11 +253,9 @@ protected SignedBeaconBlock assertBlockUnblinded(
       final SignedBeaconBlock blindedBlock, final Spec spec) {
     final BlockFactory blockFactory = createBlockFactory(spec);
 
-    // no need to configure blobs for just testing block unblinding
-    BuilderPayload builderPayload = prepareBuilderPayload(spec, 0);
-
+    // no need to prepare blobs bundle when only testing block unblinding
     when(executionLayer.getUnblindedPayload(blindedBlock))
-        .thenReturn(SafeFuture.completedFuture(builderPayload));
+        .thenReturn(SafeFuture.completedFuture(executionPayload));
 
     final SignedBeaconBlock unblindedBlock =
         blockFactory.unblindSignedBlockIfBlinded(blindedBlock).join();
@@ -398,9 +396,8 @@ protected SszList<SszKZGCommitment> prepareBuilderBlobKzgCommitments(
 
   protected BuilderPayload prepareBuilderPayload(final Spec spec, final int blobsCount) {
     final DataStructureUtil dataStructureUtil = new DataStructureUtil(spec);
-    final ExecutionPayload executionPayload =
-        Optional.ofNullable(this.executionPayload)
-            .orElseGet(dataStructureUtil::randomExecutionPayload);
+    final ExecutionPayload builderExecutionPayload =
+        Optional.ofNullable(executionPayload).orElseGet(dataStructureUtil::randomExecutionPayload);
     final BuilderPayload builderPayload;
     if (spec.isMilestoneSupported(SpecMilestone.DENEB)) {
       final SchemaDefinitionsDeneb schemaDefinitionsDeneb =
@@ -408,9 +405,10 @@ protected BuilderPayload prepareBuilderPayload(final Spec spec, final int blobsC
       builderPayload =
           schemaDefinitionsDeneb
               .getExecutionPayloadAndBlobsBundleSchema()
-              .create(executionPayload, dataStructureUtil.randomBuilderBlobsBundle(blobsCount));
+              .create(
+                  builderExecutionPayload, dataStructureUtil.randomBuilderBlobsBundle(blobsCount));
     } else {
-      builderPayload = executionPayload;
+      builderPayload = builderExecutionPayload;
     }
     this.builderPayload = Optional.of(builderPayload);