diff --git a/tests/prague/eip7692_eof_v1/__init__.py b/tests/prague/eip7692_eof_v1/__init__.py
new file mode 100644
index 0000000000..658a50736a
--- /dev/null
+++ b/tests/prague/eip7692_eof_v1/__init__.py
@@ -0,0 +1,3 @@
+"""
+Test cases for all EIPs mentioned in the EOF V1 meta-EIP.
+"""
diff --git a/tests/prague/eip3540_eof_v1/__init__.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/__init__.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/__init__.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/__init__.py
diff --git a/tests/prague/eip3540_eof_v1/code_validation.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/code_validation.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation.py
diff --git a/tests/prague/eip3540_eof_v1/code_validation_function.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation_function.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/code_validation_function.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation_function.py
diff --git a/tests/prague/eip3540_eof_v1/code_validation_jump.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation_jump.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/code_validation_jump.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/code_validation_jump.py
diff --git a/tests/prague/eip3540_eof_v1/container.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/container.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/container.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/container.py
diff --git a/tests/prague/eip3540_eof_v1/opcodes.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/opcodes.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/opcodes.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/opcodes.py
diff --git a/tests/prague/eip3540_eof_v1/spec.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/spec.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/spec.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/spec.py
diff --git a/tests/prague/eip3540_eof_v1/test_code_validation.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_code_validation.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/test_code_validation.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_code_validation.py
diff --git a/tests/prague/eip3540_eof_v1/test_eof_example.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_eof_example.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/test_eof_example.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_eof_example.py
diff --git a/tests/prague/eip3540_eof_v1/test_example_valid_invalid.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_example_valid_invalid.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/test_example_valid_invalid.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_example_valid_invalid.py
diff --git a/tests/prague/eip3540_eof_v1/test_execution_function.py b/tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_execution_function.py
similarity index 100%
rename from tests/prague/eip3540_eof_v1/test_execution_function.py
rename to tests/prague/eip7692_eof_v1/eip3540_eof_v1/test_execution_function.py
diff --git a/tests/prague/eip7480_data_section/__init__.py b/tests/prague/eip7692_eof_v1/eip7480_data_section/__init__.py
similarity index 100%
rename from tests/prague/eip7480_data_section/__init__.py
rename to tests/prague/eip7692_eof_v1/eip7480_data_section/__init__.py
diff --git a/tests/prague/eip7480_data_section/spec.py b/tests/prague/eip7692_eof_v1/eip7480_data_section/spec.py
similarity index 100%
rename from tests/prague/eip7480_data_section/spec.py
rename to tests/prague/eip7692_eof_v1/eip7480_data_section/spec.py
diff --git a/tests/prague/eip7480_data_section/test_code_validation.py b/tests/prague/eip7692_eof_v1/eip7480_data_section/test_code_validation.py
similarity index 100%
rename from tests/prague/eip7480_data_section/test_code_validation.py
rename to tests/prague/eip7692_eof_v1/eip7480_data_section/test_code_validation.py
diff --git a/tests/prague/eip7480_data_section/test_data_opcodes.py b/tests/prague/eip7692_eof_v1/eip7480_data_section/test_data_opcodes.py
similarity index 100%
rename from tests/prague/eip7480_data_section/test_data_opcodes.py
rename to tests/prague/eip7692_eof_v1/eip7480_data_section/test_data_opcodes.py
diff --git a/tests/prague/eip7692_eof_v1/tracker.md b/tests/prague/eip7692_eof_v1/tracker.md
new file mode 100644
index 0000000000..49ef12304f
--- /dev/null
+++ b/tests/prague/eip7692_eof_v1/tracker.md
@@ -0,0 +1,27 @@
+# EOF Testing Coverage Tracker
+
+- [ ] Example Test Case 1
+- [x] Example Test Case 2 (./eip3540_eof_v1/test_example_valid_invalid.py::test_example_valid_invalid)
+- [ ] Example Test Case 3 (ethereum/tests: ./src/EOFTestsFiller/validInvalidFiller.yml)
+
+## EIP-3540: EOF - EVM Object Format v1
+
+## EIP-3670: EOF - Code Validation
+
+## EIP-4200: EOF - Static relative jumps
+
+## EIP-4750: EOF - Functions
+
+## EIP-5450: EOF - Stack Validation
+
+## EIP-6206: EOF - JUMPF and non-returning functions
+
+## EIP-7480: EOF - Data section access instructions
+
+## EIP-663: SWAPN, DUPN and EXCHANGE instructions
+
+## EIP-7069: Revamped CALL instructions
+
+## EIP-7620: EOF Contract Creation
+
+## EIP-7698: EOF - Creation transaction