diff --git a/testing/ef_tests/Makefile b/testing/ef_tests/Makefile
index e663ead1ab..38b863b9fb 100644
--- a/testing/ef_tests/Makefile
+++ b/testing/ef_tests/Makefile
@@ -1,4 +1,4 @@
-TESTS_TAG :=v1.3.0-rc.5
+TESTS_TAG := v1.3.0-rc.5
 TESTS = general minimal mainnet
 TARBALLS = $(patsubst %,%-$(TESTS_TAG).tar.gz,$(TESTS))
 
diff --git a/testing/ef_tests/check_all_files_accessed.py b/testing/ef_tests/check_all_files_accessed.py
index e1944aaf45..60db5125fc 100755
--- a/testing/ef_tests/check_all_files_accessed.py
+++ b/testing/ef_tests/check_all_files_accessed.py
@@ -57,9 +57,11 @@ excluded_paths = [
     "tests/general/deneb/kzg"
 ]
 
+
 def normalize_path(path):
     return path.split("consensus-spec-tests/")[1]
 
+
 # Determine the list of filenames which were accessed during tests.
 passed = set()
 for line in open(accessed_files_filename, 'r').readlines():
@@ -92,4 +94,5 @@ for root, dirs, files in os.walk(tests_dir_filename):
 # Exit with an error if there were any files missed.
 assert len(missed) == 0, "{} missed files".format(len(missed))
 
-print("Accessed {} files ({} intentionally excluded)".format(accessed_files, excluded_files))
+print("Accessed {} files ({} intentionally excluded)".format(
+    accessed_files, excluded_files))
diff --git a/testing/ef_tests/src/cases/merkle_proof_validity.rs b/testing/ef_tests/src/cases/merkle_proof_validity.rs
index cdcdaaf9b3..c180774bb6 100644
--- a/testing/ef_tests/src/cases/merkle_proof_validity.rs
+++ b/testing/ef_tests/src/cases/merkle_proof_validity.rs
@@ -28,11 +28,6 @@ pub struct MerkleProofValidity<E: EthSpec> {
 
 impl<E: EthSpec> LoadCase for MerkleProofValidity<E> {
     fn load_from_dir(path: &Path, fork_name: ForkName) -> Result<Self, Error> {
-        //FIXME(sean)
-        if path.ends_with("execution_merkle_proof") {
-            return Err(Error::SkippedKnownFailure);
-        }
-
         let spec = &testing_spec::<E>(fork_name);
         let state = ssz_decode_state(&path.join("object.ssz_snappy"), spec)?;
         let merkle_proof = yaml_decode_file(&path.join("proof.yaml"))?;
diff --git a/testing/ef_tests/src/handler.rs b/testing/ef_tests/src/handler.rs
index 23fb20cf20..e6ca6aeaa0 100644
--- a/testing/ef_tests/src/handler.rs
+++ b/testing/ef_tests/src/handler.rs
@@ -1,6 +1,6 @@
 use crate::cases::{self, Case, Cases, EpochTransition, LoadCase, Operation};
+use crate::type_name;
 use crate::type_name::TypeName;
-use crate::{type_name, Error};
 use derivative::Derivative;
 use std::fs::{self, DirEntry};
 use std::marker::PhantomData;
@@ -57,17 +57,11 @@ pub trait Handler {
             .filter_map(as_directory)
             .flat_map(|suite| fs::read_dir(suite.path()).expect("suite dir exists"))
             .filter_map(as_directory)
-            .filter_map(|test_case_dir| {
+            .map(|test_case_dir| {
                 let path = test_case_dir.path();
 
-                let case_result = Self::Case::load_from_dir(&path, fork_name);
-
-                if let Err(Error::SkippedKnownFailure) = case_result.as_ref() {
-                    return None;
-                }
-
-                let case = case_result.expect("test should load");
-                Some((path, case))
+                let case = Self::Case::load_from_dir(&path, fork_name).expect("test should load");
+                (path, case)
             })
             .collect();
 
@@ -664,6 +658,11 @@ impl<E: EthSpec + TypeName> Handler for MerkleProofValidityHandler<E> {
 
     fn is_enabled_for_fork(&self, fork_name: ForkName) -> bool {
         fork_name != ForkName::Base
+            // Test is skipped due to some changes in the Capella light client
+            // spec.
+            //
+            // https://github.com/sigp/lighthouse/issues/4022
+            && fork_name != ForkName::Capella && fork_name != ForkName::Deneb
     }
 }