diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6384fcf..6bab9ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,5 +98,5 @@ endif()
 
 if (DEFINED BESM666__E2E_TESTS_BUILD)
     enable_testing()
+    add_subdirectory(e2e_test)
 endif()
-add_subdirectory(e2e_test)
diff --git a/e2e_test/CMakeLists.txt b/e2e_test/CMakeLists.txt
index 9bb1a69..9dcc992 100644
--- a/e2e_test/CMakeLists.txt
+++ b/e2e_test/CMakeLists.txt
@@ -46,14 +46,3 @@ if (DEFINED BESM666__E2E_TESTS_BUILD)
     besm666_e2etest_c(./bubblesort-test.c)
     besm666_e2etest_c(./primenumber-test.c)
 endif()
-
-if (DEFINED BESM666__SIMULATOR_BUILD)
-    add_executable(besm666-a0-validator)
-    target_sources(besm666-a0-validator PRIVATE
-        ./a0-validator.cpp
-    )
-    target_link_libraries(besm666-a0-validator PRIVATE
-        besm666_shared
-    )
-endif()
-
diff --git a/e2e_test/a0-validator.cpp b/e2e_test/a0-validator.cpp
deleted file mode 100644
index 72f4ff9..0000000
--- a/e2e_test/a0-validator.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <iostream>
-
-#include "besm-666/exec/gprf.hpp"
-#include "besm-666/sim/config.hpp"
-#include "besm-666/sim/machine.hpp"
-
-int main(int argc, char* argv[]) {
-    if(argc != 2) {
-        std::cerr << "Invalid arguments, expected elf file name" << std::endl;
-        std::terminate();
-    }
-
-    besm::sim::ConfigBuilder configBuilder;
-    configBuilder.setExecutablePath(argv[1]);
-
-    besm::sim::Config config = configBuilder.build();
-
-    besm::sim::Machine machine(config);
-
-    machine.run();
-
-    besm::exec::GPRFStateDumper(std::clog).dump(machine.getState());
-
-    if(machine.getState().read(besm::exec::GPRF::X10) == 1) {
-        return 0;
-    } else {
-        return 1;
-    }
-}