diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c
index 0441ceb9b9..7b5702343e 100644
--- a/src/tests/eo/suite/eo_suite.c
+++ b/src/tests/eo/suite/eo_suite.c
@@ -80,8 +80,6 @@ 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) ||
@@ -110,7 +108,5 @@ main(int argc, char **argv)
    failed_count = srunner_ntests_failed(sr);
    srunner_free(sr);
 
-   eo_shutdown();
-
    return (failed_count == 0) ? 0 : 255;
 }
diff --git a/src/tests/eo/suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index 3bf4b49cb7..de4c55d4a5 100644
--- a/src/tests/eo/suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c
@@ -10,9 +10,9 @@
 START_TEST(eo_simple)
 {
    fail_if(!eo_init()); /* one init by test suite */
-   fail_if(eo_init() != 1);
-   fail_if(eo_shutdown() != 1);
+   fail_if(!eo_init());
    fail_if(!eo_shutdown());
+   fail_if(eo_shutdown());
 }
 END_TEST