diff --git a/legacy/eina/src/tests/eina_test_hash.c b/legacy/eina/src/tests/eina_test_hash.c
index 6c82bd1678..c90378d6c9 100644
--- a/legacy/eina/src/tests/eina_test_hash.c
+++ b/legacy/eina/src/tests/eina_test_hash.c
@@ -151,9 +151,49 @@ START_TEST(eina_hash_double_item)
 }
 END_TEST
 
+START_TEST(eina_hash_all_int)
+{
+   Eina_Hash *hash;
+   int64_t j[] = { 4321312301243122, 6, 7 };
+   int i[] = { 42, 6, 7 };
+   int64_t *test2;
+   int *test;
+   int it;
+
+   fail_if(eina_init() != 2);
+
+   hash = eina_hash_int32_new(NULL);
+   fail_if(hash == NULL);
+
+   for (it = 0; it < 3; ++it)
+     fail_if(eina_hash_add(hash, &i[it], &i[it]) != EINA_TRUE);
+
+   fail_if(eina_hash_del(hash, &i[1], &i[1]) != EINA_TRUE);
+   test = eina_hash_find(hash, &i[2]);
+   fail_if(test != &i[2]);
+
+   eina_hash_free(hash);
+
+   hash = eina_hash_int64_new(NULL);
+   fail_if(hash == NULL);
+
+   for (it = 0; it < 3; ++it)
+     fail_if(eina_hash_add(hash, &j[it], &j[it]) != EINA_TRUE);
+
+   fail_if(eina_hash_del(hash, &j[1], &j[1]) != EINA_TRUE);
+   test2 = eina_hash_find(hash, &j[0]);
+   fail_if(test2 != &j[0]);
+
+   eina_hash_free(hash);
+
+   fail_if(eina_shutdown() != 1);
+}
+END_TEST
+
 void eina_test_hash(TCase *tc)
 {
    tcase_add_test(tc, eina_hash_simple);
    tcase_add_test(tc, eina_hash_extended);
    tcase_add_test(tc, eina_hash_double_item);
+   tcase_add_test(tc, eina_hash_all_int);
 }
diff --git a/legacy/eina/src/tests/eina_test_log.c b/legacy/eina/src/tests/eina_test_log.c
index 1b4a4f0a82..77fd9638e2 100644
--- a/legacy/eina/src/tests/eina_test_log.c
+++ b/legacy/eina/src/tests/eina_test_log.c
@@ -84,6 +84,7 @@ END_TEST
 START_TEST(eina_log_domains_slot_reuse)
 {
    fail_if(!eina_init());
+   fail_if(!eina_threads_init());
 
    // Create 9 domains
    int idx[9];
@@ -112,6 +113,7 @@ START_TEST(eina_log_domains_slot_reuse)
    // Check for slot reuse
    fail_if(new != removed);
 
+   eina_threads_shutdown();
    eina_shutdown();
 }
 END_TEST
@@ -119,6 +121,8 @@ END_TEST
 START_TEST(eina_log_level_indexes)
 {
    fail_if(!eina_init());
+   fail_if(!eina_threads_init());
+   fail_if(!eina_threads_init());
 
    int d = eina_log_domain_register("Levels", EINA_COLOR_GREEN);
    fail_if(d < 0);
@@ -129,6 +133,8 @@ START_TEST(eina_log_level_indexes)
    // Displayed only if user sets level 6 or higher
    EINA_LOG(d, 6, "Higher level debug\n");
 
+   eina_threads_shutdown();
+   eina_threads_shutdown();
    eina_shutdown();
 }
 END_TEST
diff --git a/legacy/eina/src/tests/eina_test_main.c b/legacy/eina/src/tests/eina_test_main.c
index 9cf38cd20a..b9cd469c6f 100644
--- a/legacy/eina/src/tests/eina_test_main.c
+++ b/legacy/eina/src/tests/eina_test_main.c
@@ -32,7 +32,31 @@ START_TEST(eina_simple)
 }
 END_TEST
 
+START_TEST(eina_cpu)
+{
+   fail_if(eina_init() != 2); /* one init by test suite */
+
+   fail_if(eina_cpu_count() <= 0);
+
+   eina_cpu_features_get();
+
+   fail_if(eina_shutdown() != 1);
+}
+END_TEST
+
+START_TEST(eina_hamster)
+{
+   fail_if(eina_init() != 2); /* one init by test suite */
+
+   fail_if(eina_hamster_count() <= 0);
+
+   fail_if(eina_shutdown() != 1);
+}
+END_TEST
+
 void eina_test_main(TCase *tc)
 {
    tcase_add_test(tc, eina_simple);
+   tcase_add_test(tc, eina_cpu);
+   tcase_add_test(tc, eina_hamster);
 }