diff --git a/tests/core/pyspec/eth2spec/test/helpers/consolidations.py b/tests/core/pyspec/eth2spec/test/helpers/consolidations.py
index f47ea669f..94faf4275 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/consolidations.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/consolidations.py
@@ -4,12 +4,11 @@ from eth2spec.test.helpers.withdrawals import (
 
 
 def prepare_switch_to_compounding_request(spec, state, validator_index, address=None):
-    if address is not None:
-        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
-
     validator = state.validators[validator_index]
-    if not spec.has_execution_withdrawal_credential(validator):
-        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index)
+
+    # Set the supplied address or the default one if needed
+    if address is not None or not spec.has_execution_withdrawal_credential(validator):
+        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
 
     return spec.ConsolidationRequest(
         source_address=state.validators[validator_index].withdrawal_credentials[12:],
diff --git a/tests/core/pyspec/eth2spec/test/helpers/withdrawals.py b/tests/core/pyspec/eth2spec/test/helpers/withdrawals.py
index f590e81e9..afa0cc00e 100644
--- a/tests/core/pyspec/eth2spec/test/helpers/withdrawals.py
+++ b/tests/core/pyspec/eth2spec/test/helpers/withdrawals.py
@@ -139,12 +139,11 @@ def prepare_pending_withdrawal(spec, state, validator_index,
 
 
 def prepare_withdrawal_request(spec, state, validator_index, address=None, amount=None):
-    if address is not None:
-        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
-
     validator = state.validators[validator_index]
-    if not spec.has_execution_withdrawal_credential(validator):
-        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index)
+    
+    # Set the supplied address or the default one if needed
+    if address is not None or not spec.has_execution_withdrawal_credential(validator):
+        set_eth1_withdrawal_credential_with_balance(spec, state, validator_index, address=address)
 
     if amount is None:
         amount = spec.FULL_EXIT_REQUEST_AMOUNT