diff --git a/specs/capella/beacon-chain.md b/specs/capella/beacon-chain.md
index a8f509a94..38cda0f2f 100644
--- a/specs/capella/beacon-chain.md
+++ b/specs/capella/beacon-chain.md
@@ -162,6 +162,9 @@ class ExecutionPayloadHeader(Container):
 New EIP-2718 transaction type, with the format being the single byte `TX_TYPE_WITHDRAWAL`
 followed by an SSZ encoding of the `WithdrawalTransaction` container comprising the transaction contents.
 
+*Note*: This container is used for both a special TX that goes into an `ExecutionPayload`
+as well as in the `BeaconState`'s `withdrawal_receipts` queue.
+
 ```python
 class WithdrawalTransaction(Container):
     address: ExecutionAddress
diff --git a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
index 14602a2cd..36fcca2c0 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/execution_payload.py
@@ -1,3 +1,6 @@
+from eth2spec.test.helpers.constants import FORKS_BEFORE_CAPELLA
+
+
 def build_empty_execution_payload(spec, state, randao_mix=None):
     """
     Assuming a pre-state of the same slot, build a valid ExecutionPayload without any transactions.
@@ -32,7 +35,7 @@ def build_empty_execution_payload(spec, state, randao_mix=None):
 
 
 def get_execution_payload_header(spec, execution_payload):
-    return spec.ExecutionPayloadHeader(
+    payload_header = spec.ExecutionPayloadHeader(
         parent_hash=execution_payload.parent_hash,
         fee_recipient=execution_payload.fee_recipient,
         state_root=execution_payload.state_root,
@@ -48,6 +51,9 @@ def get_execution_payload_header(spec, execution_payload):
         block_hash=execution_payload.block_hash,
         transactions_root=spec.hash_tree_root(execution_payload.transactions)
     )
+    if spec.fork not in FORKS_BEFORE_CAPELLA:
+        payload_header.withdrawal_transactions_root = spec.hash_tree_root(execution_payload.withdrawal_transactions)
+    return payload_header
 
 
 def build_state_with_incomplete_transition(spec, state):