diff --git a/testing/ef_tests/src/cases/operations.rs b/testing/ef_tests/src/cases/operations.rs
index 09c1de941a..551f828142 100644
--- a/testing/ef_tests/src/cases/operations.rs
+++ b/testing/ef_tests/src/cases/operations.rs
@@ -298,7 +298,7 @@ impl<E: EthSpec> Operation<E> for BeaconBlockBody<E, FullPayload<E>> {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Bellatrix
+        fork_name.bellatrix_enabled()
     }
 
     fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -340,7 +340,7 @@ impl<E: EthSpec> Operation<E> for BeaconBlockBody<E, BlindedPayload<E>> {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Bellatrix
+        fork_name.bellatrix_enabled()
     }
 
     fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -396,7 +396,7 @@ impl<E: EthSpec> Operation<E> for WithdrawalsPayload<E> {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Capella
+        fork_name.capella_enabled()
     }
 
     fn decode(path: &Path, fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -428,7 +428,7 @@ impl<E: EthSpec> Operation<E> for SignedBlsToExecutionChange {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Capella
+        fork_name.capella_enabled()
     }
 
     fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -451,7 +451,7 @@ impl<E: EthSpec> Operation<E> for ExecutionLayerWithdrawalRequest {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Electra
+        fork_name.electra_enabled()
     }
 
     fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -474,7 +474,7 @@ impl<E: EthSpec> Operation<E> for DepositRequest {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Electra
+        fork_name.electra_enabled()
     }
 
     fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
@@ -497,7 +497,7 @@ impl<E: EthSpec> Operation<E> for SignedConsolidation {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Electra
+        fork_name.electra_enabled()
     }
 
     fn decode(path: &Path, _fork_name: ForkName, _spec: &ChainSpec) -> Result<Self, Error> {
diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs
index fa895b1765..27ddbc0203 100644
--- a/testing/ef_tests/src/handler.rs
+++ b/testing/ef_tests/src/handler.rs
@@ -620,7 +620,7 @@ impl<E: EthSpec + TypeName> Handler for OptimisticSyncHandler<E> {
     }
 
     fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
-        fork_name >= ForkName::Bellatrix && cfg!(not(feature = "fake_crypto"))
+        fork_name.bellatrix_enabled() && cfg!(not(feature = "fake_crypto"))
     }
 }