diff --git a/beacon_node/beacon_chain/src/test_utils.rs b/beacon_node/beacon_chain/src/test_utils.rs
index fe268d4161..2833c1aecd 100644
--- a/beacon_node/beacon_chain/src/test_utils.rs
+++ b/beacon_node/beacon_chain/src/test_utils.rs
@@ -1029,7 +1029,8 @@ where
                 BlockProductionVersion::FullV2,
             )
             .await
-            .unwrap()
+            .map_err(|e| format!("Failed to produce block at slot {}: {:?}", slot, e))
+            .expect("should produce block successfully")
         else {
             panic!("Should always be a full payload response");
         };
@@ -1092,7 +1093,8 @@ where
                 BlockProductionVersion::FullV2,
             )
             .await
-            .unwrap()
+            .map_err(|e| format!("Failed to produce block at slot {}: {:?}", slot, e))
+            .expect("should produce block successfully")
         else {
             panic!("Should always be a full payload response");
         };
diff --git a/beacon_node/execution_layer/src/engine_api/http.rs b/beacon_node/execution_layer/src/engine_api/http.rs
index e11553ff86..6dabb0bb13 100644
--- a/beacon_node/execution_layer/src/engine_api/http.rs
+++ b/beacon_node/execution_layer/src/engine_api/http.rs
@@ -41,7 +41,7 @@ pub const ENGINE_GET_PAYLOAD_V1: &str = "engine_getPayloadV1";
 pub const ENGINE_GET_PAYLOAD_V2: &str = "engine_getPayloadV2";
 pub const ENGINE_GET_PAYLOAD_V3: &str = "engine_getPayloadV3";
 pub const ENGINE_GET_PAYLOAD_V4: &str = "engine_getPayloadV4";
-pub const ENGINE_GET_PAYLOAD_V5: &str = "engine_getPayloadV4";
+pub const ENGINE_GET_PAYLOAD_V5: &str = "engine_getPayloadV5";
 pub const ENGINE_GET_PAYLOAD_TIMEOUT: Duration = Duration::from_secs(2);
 
 pub const ENGINE_FORKCHOICE_UPDATED_V1: &str = "engine_forkchoiceUpdatedV1";
diff --git a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs
index 2bc4599582..4eb71ae03f 100644
--- a/beacon_node/execution_layer/src/test_utils/handle_rpc.rs
+++ b/beacon_node/execution_layer/src/test_utils/handle_rpc.rs
@@ -270,6 +270,7 @@ pub async fn handle_rpc<E: EthSpec>(
         ENGINE_GET_PAYLOAD_V1
         | ENGINE_GET_PAYLOAD_V2
         | ENGINE_GET_PAYLOAD_V3
+        | ENGINE_GET_PAYLOAD_V5
         | ENGINE_GET_PAYLOAD_V4 => {
             let request: JsonPayloadIdRequest =
                 get_param(params, 0).map_err(|s| (s, BAD_PARAMS_ERROR_CODE))?;
@@ -430,7 +431,6 @@ pub async fn handle_rpc<E: EthSpec>(
                         _ => unreachable!(),
                     })
                 }
-                /* TODO(EIP7805) new payload handling
                 ENGINE_GET_PAYLOAD_V5 => {
                     Ok(match JsonExecutionPayload::try_from(response).unwrap() {
                         JsonExecutionPayload::Fulu(execution_payload) => {
@@ -480,7 +480,7 @@ pub async fn handle_rpc<E: EthSpec>(
                         }
                         _ => unreachable!(),
                     })
-                }*/
+                }
                 _ => unreachable!(),
             }
         }