diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs
index 27ddbc0203..410a37e768 100644
--- a/testing/ef_tests/src/handler.rs
+++ b/testing/ef_tests/src/handler.rs
@@ -584,7 +584,7 @@ impl<E: EthSpec + TypeName> Handler for ForkChoiceHandler<E> {
 
         // No FCU override tests prior to bellatrix.
         if self.handler_name == "should_override_forkchoice_update"
-            && fork_name < ForkName::Bellatrix
+            && !fork_name.bellatrix_enabled()
         {
             return false;
         }
diff --git a/testing/ef_tests/tests/tests.rs b/testing/ef_tests/tests/tests.rs
index 1809b01dc2..10a57a6b45 100644
--- a/testing/ef_tests/tests/tests.rs
+++ b/testing/ef_tests/tests/tests.rs
@@ -397,7 +397,7 @@ mod ssz_static {
             .run();
         SszStaticHandler::<LightClientBootstrapDeneb<MainnetEthSpec>, MainnetEthSpec>::deneb_only()
             .run();
-        // Re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
+        // TODO(electra) re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
         // SszStaticHandler::<LightClientBootstrapElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only()
         //     .run();
         // SszStaticHandler::<LightClientBootstrapElectra<MainnetEthSpec>, MainnetEthSpec>::electra_only()
@@ -477,7 +477,7 @@ mod ssz_static {
         SszStaticHandler::<LightClientFinalityUpdateDeneb<MainnetEthSpec>, MainnetEthSpec>::deneb_only(
         )
             .run();
-        // Re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
+        // TODO(electra) re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
         // SszStaticHandler::<LightClientFinalityUpdateElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
         // )
         //     .run();
@@ -507,7 +507,7 @@ mod ssz_static {
             .run();
         SszStaticHandler::<LightClientUpdateDeneb<MainnetEthSpec>, MainnetEthSpec>::deneb_only()
             .run();
-        // Re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
+        // TODO(electra) re-enable once https://github.com/sigp/lighthouse/issues/6002 is resolved
         // SszStaticHandler::<LightClientUpdateElectra<MinimalEthSpec>, MinimalEthSpec>::electra_only(
         // )
         // .run();