diff --git a/test/blockchaintest/CMakeLists.txt b/test/blockchaintest/CMakeLists.txt
index eeed0fab31..6823b4c6d4 100644
--- a/test/blockchaintest/CMakeLists.txt
+++ b/test/blockchaintest/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 add_executable(evmone-blockchaintest)
-target_link_libraries(evmone-blockchaintest PRIVATE evmone evmone::statetestutils GTest::gtest)
+target_link_libraries(evmone-blockchaintest PRIVATE evmone evmone::statetestutils evmone-buildinfo GTest::gtest)
 target_include_directories(evmone-blockchaintest PRIVATE ${evmone_private_include_dir})
 target_sources(
     evmone-blockchaintest PRIVATE
diff --git a/test/blockchaintest/blockchaintest.cpp b/test/blockchaintest/blockchaintest.cpp
index 61f4c7acf4..e34fe3d61e 100644
--- a/test/blockchaintest/blockchaintest.cpp
+++ b/test/blockchaintest/blockchaintest.cpp
@@ -5,6 +5,7 @@
 #include "blockchaintest.hpp"
 #include <CLI/CLI.hpp>
 #include <evmone/evmone.h>
+#include <evmone/version.h>
 #include <gtest/gtest.h>
 #include <iostream>
 
@@ -74,6 +75,8 @@ int main(int argc, char* argv[])
 
         CLI::App app{"evmone blockchain test runner"};
 
+        app.set_version_flag("--version", "evmone-blockchaintest " EVMONE_VERSION);
+
         std::vector<std::string> paths;
         app.add_option("path", paths, "Path to test file or directory")
             ->required()
diff --git a/test/statetest/CMakeLists.txt b/test/statetest/CMakeLists.txt
index 52194fc507..eaf85dfe46 100644
--- a/test/statetest/CMakeLists.txt
+++ b/test/statetest/CMakeLists.txt
@@ -17,7 +17,7 @@ target_sources(
 )
 
 add_executable(evmone-statetest)
-target_link_libraries(evmone-statetest PRIVATE evmone::statetestutils evmone GTest::gtest)
+target_link_libraries(evmone-statetest PRIVATE evmone::statetestutils evmone evmone-buildinfo GTest::gtest)
 target_include_directories(evmone-statetest PRIVATE ${evmone_private_include_dir})
 target_sources(
     evmone-statetest PRIVATE
diff --git a/test/statetest/statetest.cpp b/test/statetest/statetest.cpp
index a9dd3f26ae..8a78a25964 100644
--- a/test/statetest/statetest.cpp
+++ b/test/statetest/statetest.cpp
@@ -5,6 +5,7 @@
 #include "statetest.hpp"
 #include <CLI/CLI.hpp>
 #include <evmone/evmone.h>
+#include <evmone/version.h>
 #include <gtest/gtest.h>
 #include <iostream>
 
@@ -80,6 +81,8 @@ int main(int argc, char* argv[])
 
         CLI::App app{"evmone state test runner"};
 
+        app.set_version_flag("--version", "evmone-statetest " EVMONE_VERSION);
+
         std::vector<std::string> paths;
         app.add_option("path", paths, "Path to test file or directory")
             ->required()
diff --git a/test/t8n/t8n.cpp b/test/t8n/t8n.cpp
index ea866ea73d..86bce75955 100644
--- a/test/t8n/t8n.cpp
+++ b/test/t8n/t8n.cpp
@@ -42,7 +42,7 @@ int main(int argc, const char* argv[])
         {
             const std::string_view arg{argv[i]};
 
-            if (arg == "-v")
+            if (arg == "-v" || arg == "--version")
             {
                 std::cout << "evmone-t8n " EVMONE_VERSION "\n";
                 return 0;