diff --git a/consensus/types/src/fork_name.rs b/consensus/types/src/fork_name.rs
index 96f206d454..4d6802d1ab 100644
--- a/consensus/types/src/fork_name.rs
+++ b/consensus/types/src/fork_name.rs
@@ -120,6 +120,18 @@ impl ForkName {
         }
     }
 
+    pub fn altair_enabled(self) -> bool {
+        self >= ForkName::Altair
+    }
+
+    pub fn bellatrix_enabled(self) -> bool {
+        self >= ForkName::Bellatrix
+    }
+
+    pub fn capella_enabled(self) -> bool {
+        self >= ForkName::Capella
+    }
+
     pub fn deneb_enabled(self) -> bool {
         self >= ForkName::Deneb
     }
diff --git a/testing/ef_tests/src/cases/epoch_processing.rs b/testing/ef_tests/src/cases/epoch_processing.rs
index 390dab9a2b..dfd782a22b 100644
--- a/testing/ef_tests/src/cases/epoch_processing.rs
+++ b/testing/ef_tests/src/cases/epoch_processing.rs
@@ -342,28 +342,27 @@ impl<E: EthSpec, T: EpochTransition<E>> Case for EpochProcessing<E, T> {
     }
 
     fn is_enabled_for_fork(fork_name: ForkName) -> bool {
-        if fork_name > ForkName::Base && (T::name() == "participation_record_updates") {
-            return false;
-        }
-
-        if fork_name > ForkName::Bellatrix && T::name() == "historical_roots_update" {
-            return false;
-        }
-
-        if fork_name < ForkName::Capella && T::name() == "historical_summaries_update" {
-            return false;
-        }
-
-        if fork_name < ForkName::Altair
+        if !fork_name.altair_enabled()
             && (T::name() == "sync_committee_updates"
                 || T::name() == "inactivity_updates"
-                || T::name() == "participation_flag_updates"
-                || T::name() == "historical_summaries_update")
+                || T::name() == "participation_flag_updates")
         {
             return false;
         }
 
-        if fork_name < ForkName::Electra
+        if fork_name.altair_enabled() && T::name() == "participation_record_updates" {
+            return false;
+        }
+
+        if !fork_name.capella_enabled() && T::name() == "historical_summaries_update" {
+            return false;
+        }
+
+        if fork_name.capella_enabled() && T::name() == "historical_roots_update" {
+            return false;
+        }
+
+        if !fork_name.electra_enabled()
             && (T::name() == "pending_consolidations" || T::name() == "pending_balance_deposits")
         {
             return false;