diff --git a/test/state/CMakeLists.txt b/test/state/CMakeLists.txt
index c80ccee9f4..fe3088816f 100644
--- a/test/state/CMakeLists.txt
+++ b/test/state/CMakeLists.txt
@@ -4,7 +4,7 @@
 
 add_library(evmone-state STATIC)
 add_library(evmone::state ALIAS evmone-state)
-target_link_libraries(evmone-state PRIVATE evmc::evmc_cpp ethash::keccak)
+target_link_libraries(evmone-state PUBLIC evmc::evmc_cpp PRIVATE ethash::keccak)
 target_sources(
     evmone-state PRIVATE
     account.hpp
diff --git a/test/statetest/CMakeLists.txt b/test/statetest/CMakeLists.txt
index 20e9511e40..170b95ef3d 100644
--- a/test/statetest/CMakeLists.txt
+++ b/test/statetest/CMakeLists.txt
@@ -5,11 +5,16 @@
 hunter_add_package(nlohmann_json)
 find_package(nlohmann_json CONFIG REQUIRED)
 
-add_executable(evmone-statetest)
-target_link_libraries(evmone-statetest PRIVATE evmone evmone::state nlohmann_json::nlohmann_json GTest::gtest)
+add_library(evmone-statetestutils STATIC)
+add_library(evmone::statetestutils ALIAS evmone-statetestutils)
+target_compile_features(evmone-statetestutils PUBLIC cxx_std_20)
+target_link_libraries(evmone-statetestutils PRIVATE evmone::state nlohmann_json::nlohmann_json)
 target_sources(
-    evmone-statetest PRIVATE
+    evmone-statetestutils PRIVATE
     statetest.hpp
-    statetest.cpp
     statetest_loader.cpp
 )
+
+add_executable(evmone-statetest)
+target_link_libraries(evmone-statetest PRIVATE evmone::statetestutils evmone GTest::gtest)
+target_sources(evmone-statetest PRIVATE statetest.cpp)