diff --git a/src/lib/evas/canvas/render2/evas_render2.c b/src/lib/evas/canvas/render2/evas_render2.c
index 3a690bed81..b7dc2652ab 100644
--- a/src/lib/evas/canvas/render2/evas_render2.c
+++ b/src/lib/evas/canvas/render2/evas_render2.c
@@ -53,7 +53,7 @@ _evas_render2_th_init(void)
    if (initted) return;
    initted = EINA_TRUE;
    _th_main_queue = eina_thread_queue_new();
-   if (!eina_thread_create(&_th_main, EINA_THREAD_URGENT, 0,
+   if (!eina_thread_create(&_th_main, EINA_THREAD_URGENT, -1,
                            _evas_render2_th_main, NULL))
      ERR("Cannot create render2 thread");
 }
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index 29cd070f5f..7a89cf8b46 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -353,7 +353,7 @@ evas_gl_preload_init(void)
    eina_lock_new(&async_loader_lock);
    eina_condition_new(&async_loader_cond, &async_loader_lock);
 
-   if (!eina_thread_create(&async_loader_thread, EINA_THREAD_BACKGROUND, 0, _evas_gl_preload_tile_async, NULL))
+   if (!eina_thread_create(&async_loader_thread, EINA_THREAD_BACKGROUND, -1, _evas_gl_preload_tile_async, NULL))
      {
         // FIXME: handle error case
      }
diff --git a/src/tests/eina/eina_test_barrier.c b/src/tests/eina/eina_test_barrier.c
index 2dea3d3bb8..81b257a2ce 100644
--- a/src/tests/eina/eina_test_barrier.c
+++ b/src/tests/eina/eina_test_barrier.c
@@ -74,19 +74,19 @@ START_TEST(eina_barrier_test_simple)
     r = eina_barrier_new(&barrier, 6);
     fail_unless(r);
 
-    r = eina_thread_create(&wk1, EINA_THREAD_NORMAL, 0, wk_func, NULL);
+    r = eina_thread_create(&wk1, EINA_THREAD_NORMAL, -1, wk_func, NULL);
     fail_unless(r);
 
-    r = eina_thread_create(&wk2, EINA_THREAD_NORMAL, 0, wk_func, NULL);
+    r = eina_thread_create(&wk2, EINA_THREAD_NORMAL, -1, wk_func, NULL);
     fail_unless(r);
 
-    r = eina_thread_create(&wk3, EINA_THREAD_NORMAL, 0, wk1_func, NULL);
+    r = eina_thread_create(&wk3, EINA_THREAD_NORMAL, -1, wk1_func, NULL);
     fail_unless(r);
 
-    r = eina_thread_create(&wk4, EINA_THREAD_NORMAL, 0, wk2_func, NULL);
+    r = eina_thread_create(&wk4, EINA_THREAD_NORMAL, -1, wk2_func, NULL);
     fail_unless(r);
 
-    r = eina_thread_create(&wk5, EINA_THREAD_NORMAL, 0, wk3_func, NULL);
+    r = eina_thread_create(&wk5, EINA_THREAD_NORMAL, -1, wk3_func, NULL);
     fail_unless(r);
 
     eina_barrier_wait(&barrier);
diff --git a/src/tests/eina/eina_test_file.c b/src/tests/eina/eina_test_file.c
index f49f5b651a..28f0a3b527 100644
--- a/src/tests/eina/eina_test_file.c
+++ b/src/tests/eina/eina_test_file.c
@@ -512,7 +512,7 @@ START_TEST(eina_test_file_thread)
    fail_if(!eina_init());
 
    for (i = 0; i < 4; i++)
-     fail_if(!(eina_thread_create(&th[i], EINA_THREAD_NORMAL, 0, _eina_test_file_thread, NULL)));
+     fail_if(!(eina_thread_create(&th[i], EINA_THREAD_NORMAL, -1, _eina_test_file_thread, NULL)));
 
    for (i = 0; i < 4; i++)
      fail_if(eina_thread_join(th[i]) != NULL);
diff --git a/src/tests/eina/eina_test_lock.c b/src/tests/eina/eina_test_lock.c
index 10db5046b6..c0b45bd885 100644
--- a/src/tests/eina/eina_test_lock.c
+++ b/src/tests/eina/eina_test_lock.c
@@ -90,7 +90,7 @@ START_TEST(eina_test_spinlock)
    counter = 0;
    fail_if(!eina_spinlock_new(&spin));
 
-   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, 0, _eina_test_lock_thread, "test"));
+   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, -1, _eina_test_lock_thread, "test"));
 
    for (i = 0; i < 10000; i++)
      {
@@ -156,7 +156,7 @@ START_TEST(eina_test_tls)
 
    fail_if(!eina_tls_set(key, _eina_test_tls_alloc(42)));
 
-   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, 0, _eina_test_tls_thread, NULL));
+   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, -1, _eina_test_tls_thread, NULL));
 
    eina_thread_join(thread);
    fail_if(_eina_tls_free_count != 1);
@@ -216,7 +216,7 @@ START_TEST(eina_test_rwlock)
    fail_if(eina_rwlock_take_read(&mutex) != EINA_LOCK_SUCCEED);
    fail_if(eina_lock_take(&mtcond) != EINA_LOCK_SUCCEED);
 
-   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, 0, _eina_test_rwlock_thread, NULL));
+   fail_if(!eina_thread_create(&thread, EINA_THREAD_NORMAL, -1, _eina_test_rwlock_thread, NULL));
 
    fail_if(!eina_barrier_wait(&barrier));
    fail_if(!eina_condition_wait(&cond));
diff --git a/src/tests/eina/eina_test_safepointer.c b/src/tests/eina/eina_test_safepointer.c
index 30f696fde7..e7569588f2 100644
--- a/src/tests/eina/eina_test_safepointer.c
+++ b/src/tests/eina/eina_test_safepointer.c
@@ -123,8 +123,8 @@ START_TEST(eina_test_threading)
    fail_if(!eina_barrier_new(&b, 2));
 
    // Spawn them
-   fail_if(!eina_thread_create(&t1, 0, 0, _thread1, NULL));
-   fail_if(!eina_thread_create(&t2, 0, 0, _thread2, NULL));
+   fail_if(!eina_thread_create(&t1, EINA_THREAD_NORMAL, -1, _thread1, NULL));
+   fail_if(!eina_thread_create(&t2, EINA_THREAD_NORMAL, -1, _thread2, NULL));
 
    // And wait for the outcome !
    eina_thread_join(t1);
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index aea925ea62..bbbc3746ca 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -122,8 +122,8 @@ START_TEST(eo_threaded_calls_test)
    fail_if(!eina_barrier_new(&barrier, 2));
    fail_if(!eina_barrier_new(&barrier0, 2));
 
-   fail_if(!eina_thread_create(&threads[0], EINA_THREAD_NORMAL, 0, _thread_job, (void *) (uintptr_t)0));
-   fail_if(!eina_thread_create(&threads[1], EINA_THREAD_NORMAL, 0, _thread_job, (void *) (uintptr_t)1));
+   fail_if(!eina_thread_create(&threads[0], EINA_THREAD_NORMAL, -1, _thread_job, (void *) (uintptr_t)0));
+   fail_if(!eina_thread_create(&threads[1], EINA_THREAD_NORMAL, -1, _thread_job, (void *) (uintptr_t)1));
 
    fail_if(0 != (int)(uintptr_t)eina_thread_join(threads[0]));
    fail_if(1 != (int)(uintptr_t)eina_thread_join(threads[1]));