diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1af1a68b..726b8faea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ endif()
 
 add_subdirectory(evmc)
 add_subdirectory(src)
+enable_testing()
 add_subdirectory(test)
 
 
diff --git a/circle.yml b/circle.yml
index 61d890eb8..4d5453c27 100644
--- a/circle.yml
+++ b/circle.yml
@@ -163,8 +163,9 @@ defaults:
   evmc-test: &evmc-test
     run:
       name: "Run evmc tests"
+      working_directory: ~/build
       command: |
-        ~/build/evmc/test/evmc-vmtester ~/build/src/libhera.so
+        ctest
 
   evm2wasm-test: &evm2wasm-test
     run:
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 312fe07bc..95e3f77a5 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,3 +1,9 @@
+include(../evmc/cmake/EVMC.cmake)
+
+if(TARGET evmc::evmc-vmtester)
+    evmc_add_vm_test(NAME evmc-check TARGET hera)
+endif()
+
 if(HERA_FUZZING)
     add_subdirectory(fuzzing)
 endif()