diff --git a/testing/ef-tests/tests/tests.rs b/testing/ef-tests/tests/tests.rs
index 3aeb917a24c2..7944f9432f79 100644
--- a/testing/ef-tests/tests/tests.rs
+++ b/testing/ef-tests/tests/tests.rs
@@ -79,3 +79,20 @@ mod general_state_tests {
 }
 
 // TODO: Add ValidBlocks and InvalidBlocks tests
+
+macro_rules! blockchain_test {
+    ($test_name:ident, $dir:ident) => {
+        #[test]
+        fn $test_name() {
+            BlockchainTests::new(format!("BlockchainTests/{}", stringify!($dir))).run();
+        }
+    };
+}
+
+#[allow(missing_docs)]
+mod blockchain_tests {
+    use super::*;
+
+    blockchain_test!(valid_blocks, ValidBlocks);
+    blockchain_test!(invalid_blocks, InvalidBlocks);
+}