diff --git a/src/tests/eina_cxx/eina_cxx_suite.cc b/src/tests/eina_cxx/eina_cxx_suite.cc
index 75558059c9..9ee108226e 100644
--- a/src/tests/eina_cxx/eina_cxx_suite.cc
+++ b/src/tests/eina_cxx/eina_cxx_suite.cc
@@ -121,8 +121,6 @@ int main(int argc, char* argv[])
 
    srunner_set_xml(sr, TESTS_BUILD_DIR "/check-results.xml");
 
-   eina_init();
-
    srunner_run_all(sr, CK_ENV);
    failed_count = srunner_ntests_failed(sr);
    srunner_free(sr);
diff --git a/src/tests/eina_cxx/eina_cxx_test_thread.cc b/src/tests/eina_cxx/eina_cxx_test_thread.cc
index 11a8f39b2b..abf1c7aa18 100644
--- a/src/tests/eina_cxx/eina_cxx_test_thread.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_thread.cc
@@ -68,6 +68,7 @@ END_TEST
 
 START_TEST(eina_cxx_thread_mutexes)
 {
+  efl::eina::eina_init init;
   efl::eina::mutex m;
 
   {
@@ -103,6 +104,7 @@ void condition_thread(efl::eina::mutex& condition_mutex
 
 START_TEST(eina_cxx_thread_conditional)
 {
+  efl::eina::eina_init init;
   efl::eina::mutex m;
 
   efl::eina::mutex condition_mutex;
diff --git a/src/tests/eina_cxx/eina_cxx_test_value.cc b/src/tests/eina_cxx/eina_cxx_test_value.cc
index 61ccbed89e..d57980a303 100644
--- a/src/tests/eina_cxx/eina_cxx_test_value.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_value.cc
@@ -167,6 +167,7 @@ END_TEST
 
 START_TEST(eina_cxx_value_copying)
 {
+  efl::eina::eina_init init;
   char c = 5;
 
   efl::eina::value vchar(c);
@@ -186,6 +187,7 @@ END_TEST
 
 START_TEST(eina_cxx_value_temporaries)
 {
+  efl::eina::eina_init init;
   efl::eina::get<std::string>(efl::eina::value(std::string("Matroska")));
 }
 END_TEST