diff --git a/circle.yml b/circle.yml
index e45a8d23e..f62ba56a3 100644
--- a/circle.yml
+++ b/circle.yml
@@ -166,15 +166,24 @@ defaults:
       command: |
         ~/build/evmc/test/evmc-vmtester ~/build/src/libhera.so
 
-  evm2wasm-test: &evm2wasm-test
+  evm2wasm-direct-test: &evm2wasm-direct-test
     run:
-      name: "Run evm2wasm state tests"
+      name: "Run evm2wasm state tests (using evm2wasm.cpp directly)"
       command: |
         if [[ $PRELOAD_ASAN ]]; then export LD_PRELOAD=/usr/lib/clang/6.0/lib/linux/libclang_rt.asan-x86_64.so; fi
         testeth --version
         testeth -t GeneralStateTests/stExample -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --singletest "add11" --evmc evm1mode=evm2wasm.cpp
         testeth -t GeneralStateTests/stStackTests -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --evmc evm1mode=evm2wasm.cpp
 
+  evm2wasm-contract-test: &evm2wasm-contract-test
+    run:
+      name: "Run evm2wasm state tests (using runevm contract)"
+      command: |
+        curl -o /tmp/runevm.wasm -L https://github.com/axic/runevm/releases/download/prototype/runevm.wasm
+        testeth --version
+        testeth -t GeneralStateTests/stExample -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --singletest "add11" --evmc evm1mode=evm2wasm --evmc sys:evm2wasm=/tmp/runevm.wasm
+        testeth -t GeneralStateTests/stStackTests -- --testpath tests --vm ~/build/src/libhera.so --singlenet Byzantium --evmc evm1mode=evm2wasm --evmc sys:evm2wasm=/tmp/runevm.wasm
+
   upload-coverage-data: &upload-coverage-data
     run:
       name: "Upload coverage data"
@@ -209,7 +218,8 @@ jobs:
       - *test-wabt
       - *test-wavm
       - *evmc-test
-      - *evm2wasm-test
+      - *evm2wasm-direct-test
+      - *evm2wasm-contract-test
 
   linux-clang-shared-asan:
     <<: *linux-clang-shared