diff --git a/.github/actions/build-evm-base/action.yaml b/.github/actions/build-evm-base/action.yaml
index b8b75441b9..7a5496259b 100644
--- a/.github/actions/build-evm-base/action.yaml
+++ b/.github/actions/build-evm-base/action.yaml
@@ -60,6 +60,8 @@ runs:
       with:
         repo: ${{ steps.config-evm-reader.outputs.repo }}
         ref: ${{ steps.config-evm-reader.outputs.ref }}
+        # `targets` in the evm.yaml must be an inline array to not interfere with `config-evm-reader`'s parsing
+        targets: ${{ join(fromJSON(steps.config-evm-reader.outputs.targets), ' ') }}
     - name: Build the EVM using Besu action
       if: steps.config-evm-reader.outputs.impl == 'besu'
       uses: ./.github/actions/build-evm-client/besu
diff --git a/.github/actions/build-fixtures/action.yaml b/.github/actions/build-fixtures/action.yaml
index f4a80dfc7d..c3f3d568fb 100644
--- a/.github/actions/build-fixtures/action.yaml
+++ b/.github/actions/build-fixtures/action.yaml
@@ -24,6 +24,19 @@ runs:
       id: evm-builder
       with:
         type: ${{ steps.properties.outputs.evm-type }}
+    - name: Wrap ethereum/tests fixtures with eofwrap tool
+      shell: bash
+      if: ${{ steps.properties.outputs.eofwrap }}
+      run: |
+        curl -L ${tests_url}${tests_version}.tar.gz | tar -xz
+        ls -l
+        uv run eofwrap tests-${tests_version}/BlockchainTests/GeneralStateTests/ fixtures_${{ inputs.release_name }}/${output_path}
+        mkdir -p ./fixtures_${{ inputs.release_name }}/.meta/
+        mv fixtures_${{ inputs.release_name }}/${output_path}/metrics.json ./fixtures_${{ inputs.release_name }}/.meta/eofwrap_metrics.json
+      env:
+        tests_url: https://github.com/ethereum/tests/archive/refs/tags/v
+        tests_version: 14.1
+        output_path: blockchain_tests/osaka/eofwrap
     - name: Generate fixtures using fill
       shell: bash
       run: |
diff --git a/.github/configs/evm.yaml b/.github/configs/evm.yaml
index 9ec6866ab8..034bfd2cc0 100644
--- a/.github/configs/evm.yaml
+++ b/.github/configs/evm.yaml
@@ -10,10 +10,7 @@ eip7692:
   impl: evmone
   repo: ethereum/evmone
   ref: master
-eip7692-osaka:
-  impl: besu
-  repo: hyperledger/besu
-  ref: main
+  targets: ["evmone-t8n", "evmone-eofparse"]
 pectra-devnet-3:
   impl: ethjs
   repo: ethereumjs/ethereumjs-monorepo
diff --git a/.github/configs/feature.yaml b/.github/configs/feature.yaml
index 2ae652d4c6..35ad8d6424 100644
--- a/.github/configs/feature.yaml
+++ b/.github/configs/feature.yaml
@@ -12,12 +12,9 @@ develop:
   solc: 0.8.21
 eip7692:
   evm-type: eip7692
-  fill-params: --fork=CancunEIP7692 ./tests/osaka
-  solc: 0.8.21
-eip7692-osaka:
-  evm-type: eip7692-osaka
-  fill-params: --fork=Osaka ./tests/prague ./tests/osaka -k "not slow"
+  fill-params: --fork=Osaka ./tests/osaka
   solc: 0.8.21
+  eofwrap: true
 pectra-devnet-3:
   evm-type: pectra-devnet-3
   fill-params: --fork=Prague -m "not slow" ./tests/prague/