diff --git a/legacy/eobj/cmake/Modules/EFLCheck.cmake b/legacy/eobj/cmake/Modules/EFLCheck.cmake
index 88a2adc97b..f72932533b 100644
--- a/legacy/eobj/cmake/Modules/EFLCheck.cmake
+++ b/legacy/eobj/cmake/Modules/EFLCheck.cmake
@@ -1,5 +1,3 @@
-SET(MEMORYCHECK_COMMAND_OPTIONS "--show-reachable=no")
-
 include(CTest)
 ENABLE_TESTING()
 add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
diff --git a/legacy/eobj/tests/eo_suite.c b/legacy/eobj/tests/eo_suite.c
index 5291a7b5d5..69c3ad7446 100644
--- a/legacy/eobj/tests/eo_suite.c
+++ b/legacy/eobj/tests/eo_suite.c
@@ -75,6 +75,8 @@ main(int argc, char **argv)
    Suite *s;
    SRunner *sr;
    int i, failed_count;
+   eo_init();
+   setenv("CK_FORK", "no", 0);
 
    for (i = 1; i < argc; i++)
      if ((strcmp(argv[i], "-h") == 0) ||
@@ -99,5 +101,7 @@ main(int argc, char **argv)
    failed_count = srunner_ntests_failed(sr);
    srunner_free(sr);
 
+   eo_shutdown();
+
    return (failed_count == 0) ? 0 : 255;
 }