diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index 271f9792ef..d69407bc1e 100644
--- a/src/tests/ecore/ecore_test_animator.c
+++ b/src/tests/ecore/ecore_test_animator.c
@@ -15,7 +15,7 @@ static Eina_Bool _anim_cb(void *data EINA_UNUSED, double pos)
   fail_if(prev > pos);
   prev = pos;
 
-  if (pos == 1.0)
+  if (EINA_DBL_EQ(pos, 1.0))
     ecore_main_loop_quit();
 
   return EINA_TRUE;
@@ -59,7 +59,7 @@ Eina_Bool test_pos(Ecore_Pos_Map posmap, double v1, double v2, double (*testmap)
           return EINA_FALSE;
       }
   }
-  fail_if(ecore_animator_pos_map(1.0, posmap, v1, v2) != 1.0);
+  fail_if(!EINA_DBL_EQ(ecore_animator_pos_map(1.0, posmap, v1, v2), 1.0));
 
   return EINA_TRUE;
 }
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 9c8a890945..6521871358 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -148,16 +148,16 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
    rate = ecore_audio_obj_in_samplerate_get(in);
    fail_if(rate != 44100);
    len = ecore_audio_obj_in_length_get(in);
-   fail_if(len != 1);
+   fail_if(!EINA_DBL_EQ(len,  1));
 
    ecore_audio_obj_in_length_set(in, 2.5);
    len = ecore_audio_obj_in_length_get(in);
-   fail_if(len != 2.5);
+   fail_if(!EINA_DBL_EQ(len,  2.5));
 
    ecore_audio_obj_in_looped_set(in, EINA_TRUE);
 
    len = ecore_audio_obj_in_remaining_get(in);
-   fail_if(len != 2.5);
+   fail_if(!EINA_DBL_EQ(len,  2.5));
 
    freq = (intptr_t) efl_key_data_get(in, ECORE_AUDIO_ATTR_TONE_FREQ);
    fail_if(freq != 1000);
@@ -173,28 +173,28 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
    ck_assert_str_eq(tmp, "bar");
 
    len = ecore_audio_obj_in_seek(in, 5.0, SEEK_SET);
-   fail_if(len != -1);
+   fail_if(!EINA_DBL_EQ(len,  -1));
 
    len = ecore_audio_obj_in_seek(in, 1.0, 42);
-   fail_if(len != -1);
+   fail_if(!EINA_DBL_EQ(len,  -1));
 
    len = ecore_audio_obj_in_seek(in, 1.0, SEEK_SET);
-   fail_if(len != 1.0);
+   fail_if(!EINA_DBL_EQ(len,  1.0));
 
    len = ecore_audio_obj_in_remaining_get(in);
-   fail_if(len != 1.5);
+   fail_if(!EINA_DBL_EQ(len,  1.5));
 
    len = ecore_audio_obj_in_seek(in, 1.0, SEEK_CUR);
-   fail_if(len != 2.0);
+   fail_if(!EINA_DBL_EQ(len,  2.0));
 
    len = ecore_audio_obj_in_remaining_get(in);
-   fail_if(len != 0.5);
+   fail_if(!EINA_DBL_EQ(len,  0.5));
 
    len = ecore_audio_obj_in_seek(in, -1.0, SEEK_END);
-   fail_if(len != 1.5);
+   fail_if(!EINA_DBL_EQ(len,  1.5));
 
    len = ecore_audio_obj_in_remaining_get(in);
-   fail_if(len != 1.0);
+   fail_if(!EINA_DBL_EQ(len,  1.0));
 
    out = efl_add_ref(ECORE_AUDIO_OUT_SNDFILE_CLASS, NULL);
    fail_if(!out);
@@ -260,18 +260,18 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_sndfile)
    rate = ecore_audio_obj_in_samplerate_get(in);
    fail_if(rate != 44100);
    len = ecore_audio_obj_in_length_get(in);
-   fail_if(len == 0);
+   fail_if(EINA_DBL_EQ(len, 0));
    rem = ecore_audio_obj_in_remaining_get(in);
-   fail_if(len != rem);
+   fail_if(!EINA_DBL_EQ(len,  rem));
 
    fmt = ecore_audio_obj_format_get(in);
    fail_if(fmt != ECORE_AUDIO_FORMAT_OGG);
 
    len = ecore_audio_obj_in_seek(in, 0.5, SEEK_SET);
-   fail_if(len != 0.5);
+   fail_if(!EINA_DBL_EQ(len,  0.5));
 
    len = ecore_audio_obj_in_seek(in, 1.0, SEEK_CUR);
-   fail_if(len != 1.5);
+   fail_if(!EINA_DBL_EQ(len,  1.5));
 
    len = ecore_audio_obj_in_seek(in, -1.5, SEEK_END);
    fail_if(fabs(rem - 1 - len) > 0.6);
@@ -467,22 +467,22 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in)
   fail_if(!freed);
 
   speed = ecore_audio_obj_in_speed_get(in);
-  fail_if(speed != 1.0);
+  fail_if(!EINA_DBL_EQ(speed,  1.0));
 
   ecore_audio_obj_in_speed_set(in, 2.5);
 
   speed = ecore_audio_obj_in_speed_get(in);
-  fail_if(speed != 2.5);
+  fail_if(!EINA_DBL_EQ(speed,  2.5));
 
   ecore_audio_obj_in_speed_set(in, 0);
 
   speed = ecore_audio_obj_in_speed_get(in);
-  fail_if(speed != 0.2);
+  fail_if(!EINA_DBL_EQ(speed,  0.2));
 
   ecore_audio_obj_in_speed_set(in, 10);
 
   speed = ecore_audio_obj_in_speed_get(in);
-  fail_if(speed != 5.0);
+  fail_if(!EINA_DBL_EQ(speed,  5.0));
 
   samplerate = ecore_audio_obj_in_samplerate_get(in);
   fail_if(samplerate != 0);
@@ -509,10 +509,10 @@ EFL_START_TEST(ecore_test_ecore_audio_obj_in)
   fail_if(!looped);
 
   length = ecore_audio_obj_in_length_get(in);
-  fail_if(length != 0);
+  fail_if(!EINA_DBL_EQ(length,  0));
 
   length = ecore_audio_obj_in_remaining_get(in);
-  fail_if(length != -1);
+  fail_if(!EINA_DBL_EQ(length,  -1));
 
   memset(buf, 0xaa, 10);
   read = ecore_audio_obj_in_read(in, buf, 10);
@@ -573,11 +573,11 @@ EFL_START_TEST(ecore_test_ecore_audio_obj)
     fail_if(!paused);
 
     volume = ecore_audio_obj_volume_get(obj);
-    fail_if(volume != 1.0);
+    fail_if(!EINA_DBL_EQ(volume,  1.0));
 
     ecore_audio_obj_volume_set(obj, 0.5);
     volume = ecore_audio_obj_volume_get(obj);
-    fail_if(volume != 0.5);
+    fail_if(!EINA_DBL_EQ(volume,  0.5));
 
     efl_unref(obj);
   }
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index b295738e35..caaa643f55 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -60,11 +60,11 @@ _timer2_cb(void *data)
 
    // check set new interval for timer 1
    ecore_timer_interval_set(timer->timer1, timer->interval_1[timer->num_elem]);
-   fail_if(timer->interval_1[timer->num_elem] != ecore_timer_interval_get(timer->timer1), "Error set new interval");
+   fail_if(!EINA_DBL_EQ(timer->interval_1[timer->num_elem], ecore_timer_interval_get(timer->timer1)), "Error set new interval");
 
    // check set new precision
    ecore_timer_precision_set(timer->precision[timer->num_elem]);
-   fail_if(timer->precision[timer->num_elem] != ecore_timer_precision_get(), "Error set new precision");
+   fail_if(!EINA_DBL_EQ(timer->precision[timer->num_elem], ecore_timer_precision_get()), "Error set new precision");
 
    // check removal timer 2
    if (ecore_timer_del(timer->timer2))
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index 45d5671afc..7a6333fa0e 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -43,7 +43,7 @@ _add(void *data, int type EINA_UNUSED, void *ev)
 
         ecore_con_client_timeout_set(event->client, timeout_val);
         ret = ecore_con_client_timeout_get(event->client);
-        fail_if (ret != timeout_val);
+        fail_if (!EINA_DBL_EQ(ret, timeout_val));
 
         ecore_con_client_data_set(event->client, cdata);
         del_data = ecore_con_client_data_get(event->client);
@@ -243,7 +243,7 @@ void _ecore_con_server_client_tests(Ecore_Con_Type compl_type, const char *name,
 
    ecore_con_server_timeout_set(server, timeout_val);
    timeout_ret = ecore_con_server_timeout_get(server);
-   fail_if (timeout_ret != timeout_val);
+   fail_if (!EINA_DBL_EQ(timeout_ret, timeout_val));
 
    ret = ecore_con_server_port_get(server);
    fail_if (ret != server_port);
diff --git a/src/tests/eet/eet_test_common.c b/src/tests/eet/eet_test_common.c
index b9011c7be9..a9a510f0e9 100644
--- a/src/tests/eet/eet_test_common.c
+++ b/src/tests/eet/eet_test_common.c
@@ -549,22 +549,22 @@ eet_test_ex_check(Eet_Test_Ex_Type *stuff,
    if (tmp > 0.00005)
      return 1;
 
-   if (stuff->f2 != -(EET_TEST_FLOAT2 + offset))
+   if (!EINA_FLT_EQ(stuff->f2, -(EET_TEST_FLOAT2 + offset)))
      return 1;
 
-   if (stuff->d2 != -(EET_TEST_DOUBLE2 + offset))
+   if (!EINA_DBL_EQ(stuff->d2, -(EET_TEST_DOUBLE2 + offset)))
      return 1;
 
-   if (stuff->f3 != EET_TEST_FLOAT3 + offset)
+   if (!EINA_FLT_EQ(stuff->f3, EET_TEST_FLOAT3 + offset))
      return 1;
 
-   if (stuff->d3 != EET_TEST_DOUBLE3 + offset)
+   if (!EINA_DBL_EQ(stuff->d3, EET_TEST_DOUBLE3 + offset))
      return 1;
 
-   if (stuff->f4 != EET_TEST_FLOAT2 + offset)
+   if (!EINA_FLT_EQ(stuff->f4, EET_TEST_FLOAT2 + offset))
      return 1;
 
-   if (stuff->d4 != EET_TEST_DOUBLE2 + offset)
+   if (!EINA_DBL_EQ(stuff->d4, EET_TEST_DOUBLE2 + offset))
      return 1;
 
    if (stuff->uc != EET_TEST_CHAR + offset)
diff --git a/src/tests/eet/eet_test_data.c b/src/tests/eet/eet_test_data.c
index ae5d013fcc..244d71373f 100644
--- a/src/tests/eet/eet_test_data.c
+++ b/src/tests/eet/eet_test_data.c
@@ -544,11 +544,11 @@ EFL_START_TEST(eet_test_data_fp)
    fail_if(build->f1 != eina_f32p32_int_from(1));
    fail_if(build->f0 != 0);
 
-   fail_if(convert->fp32 != 1.125);
-   fail_if(convert->fp16 != 2000);
-   fail_if(convert->fp8 != 125);
-   fail_if(convert->f1 != 1);
-   fail_if(convert->f0 != 0);
+   fail_if(!EINA_DBL_EQ(convert->fp32, 1.125));
+   fail_if(!EINA_DBL_EQ(convert->fp16, 2000));
+   fail_if(!EINA_DBL_EQ(convert->fp8, 125));
+   fail_if(!EINA_DBL_EQ(convert->f1, 1));
+   fail_if(!EINA_DBL_EQ(convert->f0, 0));
 
 }
 EFL_END_TEST
@@ -774,7 +774,7 @@ EFL_START_TEST(eet_test_data_hash_value)
 
    val = (Eina_Value *)eina_hash_find(h->hash, "val/double");
    eina_value_get(val, &d);
-   fail_if((!val) || (d != EET_TEST_DOUBLE));
+   fail_if((!val) || (!EINA_DBL_EQ(d, EET_TEST_DOUBLE)));
 
    val = (Eina_Value *)eina_hash_find(h->hash, "val/string");
    eina_value_get(val, &s);
diff --git a/src/tests/eet/eet_test_file.c b/src/tests/eet/eet_test_file.c
index 6d77a7d817..9423dc8aed 100644
--- a/src/tests/eet/eet_test_file.c
+++ b/src/tests/eet/eet_test_file.c
@@ -435,11 +435,11 @@ EFL_START_TEST(eet_test_file_fp)
    fail_if(build->f1 != eina_f32p32_int_from(1));
    fail_if(build->f0 != 0);
 
-   fail_if(convert->fp32 != 1.125);
-   fail_if(convert->fp16 != 2000);
-   fail_if(convert->fp8 != 125);
-   fail_if(convert->f1 != 1);
-   fail_if(convert->f0 != 0);
+   fail_if(!EINA_DBL_EQ(convert->fp32, 1.125));
+   fail_if(!EINA_DBL_EQ(convert->fp16, 2000));
+   fail_if(!EINA_DBL_EQ(convert->fp8, 125));
+   fail_if(!EINA_DBL_EQ(convert->f1, 1));
+   fail_if(!EINA_DBL_EQ(convert->f0, 0));
 
    eet_close(ef);
 
diff --git a/src/tests/eina/eina_test_bezier.c b/src/tests/eina/eina_test_bezier.c
index 36de00dc13..f07bb5f5c2 100644
--- a/src/tests/eina/eina_test_bezier.c
+++ b/src/tests/eina/eina_test_bezier.c
@@ -42,14 +42,14 @@ EFL_START_TEST(eina_bezier_test_values)
                           &cx1, &cy1,
                           &cx2, &cy2,
                           &ex, &ey);
-   fail_if(sx != 1 ||
-           sy != 2 ||
-           cx1 != 3 ||
-           cy1 != 4 ||
-           cx2 != 5 ||
-           cy2 != 6 ||
-           ex != 7 ||
-           ey != 8);
+   fail_if(!EINA_DBL_EQ(sx, 1) ||
+           !EINA_DBL_EQ(sy, 2) ||
+           !EINA_DBL_EQ(cx1, 3) ||
+           !EINA_DBL_EQ(cy1, 4) ||
+           !EINA_DBL_EQ(cx2, 5) ||
+           !EINA_DBL_EQ(cy2, 6) ||
+           !EINA_DBL_EQ(ex, 7) ||
+           !EINA_DBL_EQ(ey, 8));
 }
 EFL_END_TEST
 
@@ -65,7 +65,7 @@ EFL_START_TEST(eina_bezier_test_angle)
                           7, 1);
    angle = eina_bezier_angle_at(&b, 0.5);
 
-   fail_if(angle != 0);
+   fail_if(EINA_DBL_NONZERO(angle));
 
    eina_bezier_values_set(&b,
                           1, 2,
@@ -73,7 +73,7 @@ EFL_START_TEST(eina_bezier_test_angle)
                           1, 6,
                           1, 8);
    angle = eina_bezier_angle_at(&b, 0.5);
-   fail_if(floor(angle) != 90);
+   fail_if(!EINA_DBL_EQ(floor(angle), 90));
 
 }
 EFL_END_TEST
@@ -89,7 +89,7 @@ EFL_START_TEST(eina_bezier_test_length)
                           5, 1,
                           7, 1);
    length = eina_bezier_length_get(&b);
-   fail_if(floor(length) != 6);
+   fail_if(!EINA_DBL_EQ(floor(length), 6));
 
    eina_bezier_values_set(&b,
                           1, 1,
@@ -97,7 +97,7 @@ EFL_START_TEST(eina_bezier_test_length)
                           1, 1,
                           1, 1);
    length = eina_bezier_length_get(&b);
-   fail_if(length != 0);
+   fail_if(!EINA_DBL_EQ(length, 0));
 
 }
 EFL_END_TEST
@@ -114,10 +114,10 @@ EFL_START_TEST(eina_bezier_test_t_at)
                           7, 1);
    length = eina_bezier_length_get(&b);
    t = eina_bezier_t_at(&b, 0);
-   fail_if(floor(t) != 0);
+   fail_if(!EINA_DBL_EQ(floor(t), 0));
 
    t = eina_bezier_t_at(&b, length);
-   fail_if(t != 1);
+   fail_if(!EINA_DBL_EQ(t, 1));
 
 }
 EFL_END_TEST
@@ -133,13 +133,13 @@ EFL_START_TEST(eina_bezier_test_point_at)
                           5, 6,
                           7, 8);
    eina_bezier_point_at(&b, 0, &x , &y);
-   fail_if(x != 1 ||
-           y != 2);
+   fail_if(!EINA_DBL_EQ(x, 1) ||
+           !EINA_DBL_EQ(y, 2));
 
    eina_bezier_point_at(&b, 1, &x , &y);
 
-   fail_if(x != 7 ||
-           y != 8);
+   fail_if(!EINA_DBL_EQ(x, 7) ||
+           !EINA_DBL_EQ(y, 8));
 
 }
 EFL_END_TEST
@@ -159,7 +159,7 @@ EFL_START_TEST(eina_bezier_test_split_at_length)
    len1 = eina_bezier_length_get(&l);
    len2 = eina_bezier_length_get(&r);
 
-   fail_if(len != (len1 + len2));
+   fail_if(!EINA_DBL_EQ(len, (len1 + len2)));
 
 }
 EFL_END_TEST
@@ -177,7 +177,7 @@ EFL_START_TEST(eina_bezier_test_bounds_get)
 
    eina_bezier_bounds_get(&b, &x, &y, &w, &h);
 
-   fail_if(x !=0 || y!=0 || w !=100 || h !=100 );
+   fail_if(!EINA_DBL_EQ(x, 0) || !EINA_DBL_EQ(y, 0) || !EINA_DBL_EQ(w, 100) || !EINA_DBL_EQ(h, 100));
 
 }
 EFL_END_TEST
@@ -196,7 +196,7 @@ EFL_START_TEST(eina_bezier_test_on_interval)
    eina_bezier_on_interval(&b, 0.25, 0.5, &res);
    eina_bezier_point_at(&res, 0, &px2, &py2);
 
-   fail_if(px1 != px2 || py1 != py2);
+   fail_if(!EINA_DBL_EQ(px1, px2) || !EINA_DBL_EQ(py1, py2));
 
 }
 EFL_END_TEST
diff --git a/src/tests/eina/eina_test_quaternion.c b/src/tests/eina/eina_test_quaternion.c
index fc1ec16bef..72360ec22c 100644
--- a/src/tests/eina/eina_test_quaternion.c
+++ b/src/tests/eina/eina_test_quaternion.c
@@ -220,7 +220,7 @@ EFL_START_TEST(eina_test_quaternion_dot)
 
 
    res = eina_quaternion_dot(&q, &r);
-   fail_if(res != 59);
+   fail_if(!EINA_DBL_EQ(res, 59));
 
 }
 EFL_END_TEST
@@ -457,25 +457,25 @@ EFL_START_TEST(eina_test_quaternion_operations)
            (out.z + 0.1 > DBL_EPSILON) || (out.w - 0.1 > DBL_EPSILON));
 
    eina_quaternion_array_set(&out, v);
-   fail_if((out.x != 0) || (out.y != 1) ||
-           (out.z != 2) || (out.w != 3));
+   fail_if((!EINA_DBL_EQ(out.x,  0)) || (!EINA_DBL_EQ(out.y,  1)) ||
+           (!EINA_DBL_EQ(out.z,  2)) || (!EINA_DBL_EQ(out.w,  3)));
 
    eina_quaternion_copy(&out, &in);
-   fail_if((out.x != 2) || (out.y != 2) ||
-           (out.z != 1) || (out.w != 1));
+   fail_if((!EINA_DBL_EQ(out.x,  2)) || (!EINA_DBL_EQ(out.y,  2)) ||
+           (!EINA_DBL_EQ(out.z,  1)) || (!EINA_DBL_EQ(out.w,  1)));
 
    eina_quaternion_homogeneous_regulate(&out, &in2);
-   fail_if((out.x != 1) || (out.y != 1) ||
-           (out.z != 1) || (out.w != 1));
+   fail_if((!EINA_DBL_EQ(out.x,  1)) || (!EINA_DBL_EQ(out.y,  1)) ||
+           (!EINA_DBL_EQ(out.z,  1)) || (!EINA_DBL_EQ(out.w,  1)));
 
    eina_quaternion_subtract(&out, &in2, &in);
-   fail_if((out.x != 3) || (out.y != 3) ||
-           (out.z != 4) || (out.w != 4));
+   fail_if((!EINA_DBL_EQ(out.x,  3)) || (!EINA_DBL_EQ(out.y,  3)) ||
+           (!EINA_DBL_EQ(out.z,  4)) || (!EINA_DBL_EQ(out.w,  4)));
 
-   fail_if(eina_quaternion_length_get(&in2) != 10);
-   fail_if(eina_quaternion_length_square_get(&in) != 10);
+   fail_if(!EINA_DBL_EQ(eina_quaternion_length_get(&in2), 10));
+   fail_if(!EINA_DBL_EQ(eina_quaternion_length_square_get(&in), 10));
    fail_if((eina_quaternion_distance_get(&in2, &in) - sqrt(50)) > DBL_EPSILON);
-   fail_if(eina_quaternion_distance_square_get(&in2, &in) != 50);
+   fail_if(!EINA_DBL_EQ(eina_quaternion_distance_square_get(&in2, &in), 50));
 
    angle = eina_quaternion_angle_plains(&in, &in2);
    fail_if(angle - 0.963 > DBL_EPSILON);
diff --git a/src/tests/eina/eina_test_vector.c b/src/tests/eina/eina_test_vector.c
index 6030dfc528..e4afa8bc9a 100644
--- a/src/tests/eina/eina_test_vector.c
+++ b/src/tests/eina/eina_test_vector.c
@@ -42,41 +42,41 @@ EFL_START_TEST(eina_test_vector2_operations)
 
 
    eina_vector2_set(&v1, x, y);
-   fail_if((v1.x != 1) || (v1.y != 2));
+   fail_if(!EINA_DBL_EQ(v1.x, 1) || !EINA_DBL_EQ(v1.y, 2));
 
    eina_vector2_array_set(&v2, arr);
-   fail_if((v2.x != 5) || (v2.y != 5));
+   fail_if(!EINA_DBL_EQ(v2.x, 5) || !EINA_DBL_EQ(v2.y, 5));
 
    eina_vector2_copy(&v1, &v2);
-   fail_if((v1.x != 5) || (v1.y != 5));
+   fail_if(!EINA_DBL_EQ(v1.x, 5) || !EINA_DBL_EQ(v1.y, 5));
 
    eina_vector2_negate(&v1, &v2);
-   fail_if((v1.x != -5) || (v1.y != -5));
+   fail_if(!EINA_DBL_EQ(v1.x, -5) || !EINA_DBL_EQ(v1.y, -5));
 
    eina_vector2_set(&v1, x, y);
    eina_vector2_add(&v3, &v1, &v2);
-   fail_if((v3.x != 6) || (v3.y != 7));
+   fail_if(!EINA_DBL_EQ(v3.x, 6) || !EINA_DBL_EQ(v3.y, 7));
 
    eina_vector2_subtract(&v3, &v2, &v1);
-   fail_if((v3.x != 4) || (v3.y != 3));
+   fail_if(!EINA_DBL_EQ(v3.x, 4) || !EINA_DBL_EQ(v3.y, 3));
 
    eina_vector2_scale(&v3, &v1, y);
-   fail_if((v3.x != 2) || (v3.y != 4));
+   fail_if(!EINA_DBL_EQ(v3.x, 2) || !EINA_DBL_EQ(v3.y, 4));
 
    res = eina_vector2_dot_product(&v1, &v2);
-   fail_if(res != 15);
+   fail_if(!EINA_DBL_EQ(res, 15));
 
    res = eina_vector2_length_get(&v2);
    fail_if((res - sqrt(50)) > DBL_EPSILON);
 
    res = eina_vector2_length_square_get(&v2);
-   fail_if(res != 50);
+   fail_if(!EINA_DBL_EQ(res, 50));
 
    res = eina_vector2_distance_get(&v2, &v1);
    fail_if((res - sqrt(25)) > DBL_EPSILON);
 
    res = eina_vector2_distance_square_get(&v2, &v1);
-   fail_if(res != 25);
+   fail_if(!EINA_DBL_EQ(res, 25));
 
    eina_vector2_normalize(&v3, &v2);
    fail_if((v3.x - v2.x / sqrt(50)) > DBL_EPSILON ||
@@ -86,10 +86,10 @@ EFL_START_TEST(eina_test_vector2_operations)
                           2, 2,
                           2, 2);
    eina_vector2_transform(&v3, &m2, &v1);
-   fail_if((v3.x != 6) || (v3.y != 6));
+   fail_if(!EINA_DBL_EQ(v3.x, 6) || !EINA_DBL_EQ(v3.y, 6));
 
    eina_vector2_transform(&v3, &m2, &v3);
-   fail_if((v3.x != 24) || (v3.y != 24));
+   fail_if(!EINA_DBL_EQ(v3.x, 24) || !EINA_DBL_EQ(v3.y, 24));
 
    eina_matrix3_values_set(&m3,
                           2, 2, 2,
@@ -97,14 +97,14 @@ EFL_START_TEST(eina_test_vector2_operations)
                           2, 2, 2);
 
    eina_vector2_homogeneous_position_transform(&v3, &m3, &v1);
-   fail_if((v3.x != 1) || (v3.y != 1));
+   fail_if(!EINA_DBL_EQ(v3.x, 1) || !EINA_DBL_EQ(v3.y, 1));
 
 
    eina_vector2_homogeneous_direction_transform(&v3, &m3, &v1);
-   fail_if((v3.x != 6) || (v3.y != 6));
+   fail_if(!EINA_DBL_EQ(v3.x, 6) || !EINA_DBL_EQ(v3.y, 6));
 
    eina_vector2_homogeneous_direction_transform(&v3, &m3, &v3);
-   fail_if((v3.x != 24) || (v3.y != 24));
+   fail_if(!EINA_DBL_EQ(v3.x, 24) || !EINA_DBL_EQ(v3.y, 24));
 
 }
 EFL_END_TEST
@@ -126,51 +126,51 @@ EFL_START_TEST(eina_test_vector3_operations)
 
 
    eina_vector3_set(&v1, x, y, z);
-   fail_if((v1.x != 1) || (v1.y != 2) || (v1.z != 3));
+   fail_if(!EINA_DBL_EQ(v1.x, 1) || !EINA_DBL_EQ(v1.y, 2) || !EINA_DBL_EQ(v1.z, 3));
 
    eina_vector3_array_set(&v2, arr);
-   fail_if((v2.x != 5) || (v2.y != 5) || (v2.z != 5));
+   fail_if(!EINA_DBL_EQ(v2.x, 5) || !EINA_DBL_EQ(v2.y, 5) || !EINA_DBL_EQ(v2.z, 5));
 
    eina_vector3_copy(&v1, &v2);
-   fail_if((v1.x != 5) || (v1.y != 5) || (v1.z != 5));
+   fail_if(!EINA_DBL_EQ(v1.x, 5) || !EINA_DBL_EQ(v1.y, 5) || !EINA_DBL_EQ(v1.z, 5));
 
    eina_vector3_negate(&v1, &v2);
-   fail_if((v1.x != -5) || (v1.y != -5), (v1.z != -5));
+   fail_if(!EINA_DBL_EQ(v1.x, -5) || !EINA_DBL_EQ(v1.y, -5) || !EINA_DBL_EQ(v1.z, -5));
 
    eina_vector3_set(&v1, x, y, z);
    eina_vector3_add(&v3, &v1, &v2);
-   fail_if((v3.x != 6) || (v3.y != 7) || v3.z != 8);
+   fail_if(!EINA_DBL_EQ(v3.x, 6) || !EINA_DBL_EQ(v3.y, 7) || !EINA_DBL_EQ(v3.z, 8));
 
    eina_vector3_subtract(&v3, &v2, &v1);
-   fail_if((v3.x != 4) || (v3.y != 3) || (v3.z != 2));
+   fail_if(!EINA_DBL_EQ(v3.x, 4) || !EINA_DBL_EQ(v3.y, 3) || !EINA_DBL_EQ(v3.z, 2));
 
    eina_vector3_scale(&v3, &v1, y);
-   fail_if((v3.x != 2) || (v3.y != 4) || (v3.z != 6));
+   fail_if(!EINA_DBL_EQ(v3.x, 2) || !EINA_DBL_EQ(v3.y, 4) || !EINA_DBL_EQ(v3.z, 6));
 
    eina_vector3_multiply(&v3, &v2, &v1);
-   fail_if((v3.x != 5) || (v3.y != 10) || (v3.z != 15));
+   fail_if(!EINA_DBL_EQ(v3.x, 5) || !EINA_DBL_EQ(v3.y, 10) || !EINA_DBL_EQ(v3.z, 15));
 
    res = eina_vector3_dot_product(&v1, &v2);
-   fail_if(res != 30);
+   fail_if(!EINA_DBL_EQ(res, 30));
 
    eina_vector3_cross_product(&v3, &v1, &v2);
-   fail_if((v3.x != -5) || (v3.y != 10) || (v3.z != -5));
+   fail_if(!EINA_DBL_EQ(v3.x, -5) || !EINA_DBL_EQ(v3.y, 10) || !EINA_DBL_EQ(v3.z, -5));
 
    eina_vector3_cross_product(&v3, &v1, &v3);
-   fail_if((v3.x != -40) || (v3.y != -10) || (v3.z != 20));
+   fail_if(!EINA_DBL_EQ(v3.x, -40) || !EINA_DBL_EQ(v3.y, -10) || !EINA_DBL_EQ(v3.z, 20));
 
 
    res = eina_vector3_length_get(&v2);
    fail_if((res - sqrt(75)) > DBL_EPSILON);
 
    res = eina_vector3_length_square_get(&v2);
-   fail_if(res != 75);
+   fail_if(!EINA_DBL_EQ(res, 75));
 
    res = eina_vector3_distance_get(&v2, &v1);
    fail_if((res - sqrt(29)) > (DBL_EPSILON * 2.0));
 
    res = eina_vector3_distance_square_get(&v2, &v1);
-   fail_if(res != 29);
+   fail_if(!EINA_DBL_EQ(res, 29));
 
    eina_vector3_normalize(&v3, &v2);
    fail_if((v3.x - v2.x / sqrt(75)) > DBL_EPSILON ||
@@ -185,10 +185,10 @@ EFL_START_TEST(eina_test_vector3_operations)
                           2, 2, 2,
                           2, 2, 2);
    eina_vector3_transform(&v3, &m3, &v1);
-   fail_if((v3.x != 12) || (v3.y != 12) || (v3.z != 12));
+   fail_if(!EINA_DBL_EQ(v3.x, 12) || !EINA_DBL_EQ(v3.y, 12) || !EINA_DBL_EQ(v3.z, 12));
 
    eina_vector3_transform(&v3, &m3, &v3);
-   fail_if((v3.x != 72) || (v3.y != 72) || (v3.z != 72));
+   fail_if(!EINA_DBL_EQ(v3.x, 72) || !EINA_DBL_EQ(v3.y, 72) || !EINA_DBL_EQ(v3.z, 72));
 
    eina_matrix4_values_set(&m4,
                           2, 2, 2, 2,
@@ -196,24 +196,24 @@ EFL_START_TEST(eina_test_vector3_operations)
                           2, 2, 2, 2,
                           2, 2, 2, 2);
    eina_vector3_homogeneous_position_transform(&v3, &m4, &v1);
-   fail_if((v3.x != 1) || (v3.y != 1) || (v3.z != 1));
+   fail_if(!EINA_DBL_EQ(v3.x, 1) || !EINA_DBL_EQ(v3.y, 1) || !EINA_DBL_EQ(v3.z, 1));
 
    eina_quaternion_set(&q, 2, 2, 2, 0);
    eina_vector3_quaternion_rotate(&v3, &v1, &q);
-   fail_if((v3.x != 25) || (v3.y != 2) || (v3.z != -21));
+   fail_if(!EINA_DBL_EQ(v3.x, 25) || !EINA_DBL_EQ(v3.y, 2) || !EINA_DBL_EQ(v3.z, -21));
 
    eina_vector3_orthogonal_projection_on_plane(&v3, &v1, &v2);
-   fail_if((v3.x != -1) || (v3.y != 0) || (v3.z != 1));
+   fail_if(!EINA_DBL_EQ(v3.x, -1) || !EINA_DBL_EQ(v3.y, 0) || !EINA_DBL_EQ(v3.z, 1));
 
    eina_vector3_plane_by_points(&q, &v3, &v1, &v2);
-   fail_if((q.x != -2) || (q.y != 4) || (q.z != -2) || (q.z > DBL_EPSILON));
+   fail_if(!EINA_DBL_EQ(q.x, -2) || !EINA_DBL_EQ(q.y, 4) || !EINA_DBL_EQ(q.z, -2) || (q.z > DBL_EPSILON));
 
    eina_vector3_homogeneous_direction_set(&v3, &q);
-   fail_if((v3.x != -2) || (v3.y != 4) || (v3.z != -2));
+   fail_if(!EINA_DBL_EQ(v3.x, -2) || !EINA_DBL_EQ(v3.y, 4) || !EINA_DBL_EQ(v3.z, -2));
 
    eina_quaternion_set(&q, 2, 2, 2, 0.5);
    eina_vector3_homogeneous_position_set(&v3, &q);
-   fail_if((v3.x != 4) || (v3.y != 4) || (v3.z != 4));
+   fail_if(!EINA_DBL_EQ(v3.x, 4) || !EINA_DBL_EQ(v3.y, 4) || !EINA_DBL_EQ(v3.z, 4));
 
    res2 = eina_vector3_equivalent(&v1, &v2);
    fail_if(res2 != EINA_FALSE);
@@ -230,10 +230,10 @@ EFL_START_TEST(eina_test_vector3_operations)
    fail_if(res2 != EINA_TRUE);
 
    eina_vector3_homogeneous_direction_transform(&v3, &m4, &v1);
-   fail_if((v3.x != 12) || (v3.y != 12) || (v3.z != 12));
+   fail_if(!EINA_DBL_EQ(v3.x, 12) || !EINA_DBL_EQ(v3.y, 12) || !EINA_DBL_EQ(v3.z, 12));
 
    eina_vector3_homogeneous_direction_transform(&v3, &m4, &v3);
-   fail_if((v3.x != 72) || (v3.y != 72) || (v3.z != 72));
+   fail_if(!EINA_DBL_EQ(v3.x, 72) || !EINA_DBL_EQ(v3.y, 72) || !EINA_DBL_EQ(v3.z, 72));
 
 }
 EFL_END_TEST
diff --git a/src/tests/elementary/efl_ui_test_config.c b/src/tests/elementary/efl_ui_test_config.c
index a9f31ea988..62ab977ae1 100644
--- a/src/tests/elementary/efl_ui_test_config.c
+++ b/src/tests/elementary/efl_ui_test_config.c
@@ -25,7 +25,15 @@ EFL_START_TEST(efl_config_eoapi)
 
 #define CONFIG_CHKB(opt, val) CONFIG_CHK(opt, bool, val)
 #define CONFIG_CHKI(opt, val) CONFIG_CHK(opt, int, val)
-#define CONFIG_CHKD(opt, val) CONFIG_CHK(opt, double, val)
+
+#define CONFIG_CHKD_internal(opt, typ, val) do { \
+   typ old = elm_config_ ## opt ## _get(); \
+   fail_if(!EINA_DBL_EQ(old, efl_config_ ## typ ## _get(cfg, #opt))); \
+   fail_if(!efl_config_ ## typ ## _set(cfg, #opt, val)); \
+   fail_if(!EINA_DBL_EQ(elm_config_ ## opt ## _get(), val)); \
+   fail_if(!EINA_DBL_EQ(efl_config_ ## typ ## _get(cfg, #opt), val)); \
+   } while (0)
+#define CONFIG_CHKD(opt, val) CONFIG_CHKD_internal(opt, double, val)
 
    // note: leaks badly
 #define CONFIG_CHKS(opt, val) do { \
diff --git a/src/tests/elementary/efl_ui_test_spin_button.c b/src/tests/elementary/efl_ui_test_spin_button.c
index db6ddc2831..6df99b340f 100644
--- a/src/tests/elementary/efl_ui_test_spin_button.c
+++ b/src/tests/elementary/efl_ui_test_spin_button.c
@@ -63,7 +63,7 @@ EFL_START_TEST (spin_wheel_test)
    get_me_to_those_events(spin);
    evas_event_feed_mouse_move(evas_object_evas_get(spin), 30, 30, 1234, NULL);
    evas_event_feed_mouse_wheel(evas_object_evas_get(spin), -1, -1, 12345, NULL);
-   ck_assert(efl_ui_range_value_get(spin) == 10.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_value_get(spin), 10.0));
    ck_assert_int_eq(changed, EINA_TRUE);
    ck_assert_int_eq(min_reached, EINA_FALSE);
    ck_assert_int_eq(max_reached, EINA_FALSE);
@@ -72,7 +72,7 @@ EFL_START_TEST (spin_wheel_test)
    max_reached = EINA_FALSE;
 
    evas_event_feed_mouse_wheel(evas_object_evas_get(spin), -1, 1, 12345, NULL);
-   ck_assert(efl_ui_range_value_get(spin) == 0.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_value_get(spin), 0.0));
    ck_assert_int_eq(changed, EINA_TRUE);
    ck_assert_int_eq(min_reached, EINA_FALSE);
    ck_assert_int_eq(max_reached, EINA_FALSE);
diff --git a/src/tests/elementary/efl_ui_test_spotlight.c b/src/tests/elementary/efl_ui_test_spotlight.c
index e26acad108..2166702797 100644
--- a/src/tests/elementary/efl_ui_test_spotlight.c
+++ b/src/tests/elementary/efl_ui_test_spotlight.c
@@ -127,7 +127,7 @@ static void
 _emit_pos(Eo *obj, double d)
 {
    printf("EMITTING %f %f\n", d, transition_calls.last_position);
-   if (d == transition_calls.last_position) return;
+   if (EINA_DBL_EQ(d, transition_calls.last_position)) return;
 
    efl_event_callback_call(obj, EFL_UI_SPOTLIGHT_MANAGER_EVENT_POS_UPDATE, &d);
    transition_calls.last_position = d;
@@ -403,7 +403,7 @@ _verify_indicator_calls(void)
    ck_assert_ptr_eq(indicator_calls.content_add.subobj, w);
    ck_assert_int_eq(indicator_calls.content_del.called, 0);
    ck_assert_int_eq(indicator_calls.position_update.called, 1);
-   ck_assert(indicator_calls.position_update.position == 0.0);
+   ck_assert(EINA_DBL_EQ(indicator_calls.position_update.position, 0.0));
    indicator_calls.content_add.called = 0;
    indicator_calls.position_update.called = 0;
 
@@ -414,7 +414,7 @@ _verify_indicator_calls(void)
    ck_assert_ptr_eq(indicator_calls.content_add.subobj, w1);
    ck_assert_int_eq(indicator_calls.content_del.called, 0);
    ck_assert_int_eq(indicator_calls.position_update.called, 1);
-   ck_assert(indicator_calls.position_update.position == 1.0);
+   ck_assert(EINA_DBL_EQ(indicator_calls.position_update.position, 1.0));
    indicator_calls.content_add.called = 0;
    indicator_calls.position_update.called = 0;
 
@@ -435,7 +435,7 @@ _verify_indicator_calls(void)
    ck_assert_int_eq(indicator_calls.content_del.index, 0);
    ck_assert_ptr_eq(indicator_calls.content_del.subobj, w1);
    ck_assert_int_eq(indicator_calls.position_update.called, 1);
-   ck_assert(indicator_calls.position_update.position == 0.0);
+   ck_assert(EINA_DBL_EQ(indicator_calls.position_update.position, 0.0));
    indicator_calls.content_del.called = 0;
    indicator_calls.position_update.called = 0;
 }
diff --git a/src/tests/elementary/spec/efl_test_gfx_arrangement.c b/src/tests/elementary/spec/efl_test_gfx_arrangement.c
index 7c0367b147..417a12bae5 100644
--- a/src/tests/elementary/spec/efl_test_gfx_arrangement.c
+++ b/src/tests/elementary/spec/efl_test_gfx_arrangement.c
@@ -18,8 +18,8 @@ EFL_START_TEST(pack_align)
    double v, h; \
    efl_gfx_arrangement_content_align_set(widget, H, V); \
    efl_gfx_arrangement_content_align_get(widget, &h, &v); \
-   ck_assert(v == rv); \
-   ck_assert(h == rh); \
+   ck_assert(EINA_DBL_EQ(v, rv)); \
+   ck_assert(EINA_DBL_EQ(h, rh)); \
   } while(0);
 
   TUPLE_CHECK(  1.0,   1.0,  1.0,  1.0);
diff --git a/src/tests/elementary/spec/efl_test_range_display.c b/src/tests/elementary/spec/efl_test_range_display.c
index 5704741556..49b1c769a3 100644
--- a/src/tests/elementary/spec/efl_test_range_display.c
+++ b/src/tests/elementary/spec/efl_test_range_display.c
@@ -19,12 +19,12 @@ EFL_START_TEST(value_setting_limits)
    EXPECT_ERROR_START;
    efl_ui_range_value_set(widget, -25.0);
    EXPECT_ERROR_END;
-   ck_assert(efl_ui_range_value_get(widget) == 10.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_value_get(widget),  10.0));
 
    EXPECT_ERROR_START;
    efl_ui_range_value_set(widget, 25.0);
    EXPECT_ERROR_END;
-   ck_assert(efl_ui_range_value_get(widget) == 10.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_value_get(widget), 10.0));
 }
 EFL_END_TEST
 
@@ -34,38 +34,38 @@ EFL_START_TEST(limit_setting)
 
    efl_ui_range_limits_set(widget, -20.0, 20.0);
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == -20.0);
-   ck_assert(max == 20.0);
+   ck_assert(EINA_DBL_EQ(min,  -20.0));
+   ck_assert(EINA_DBL_EQ(max,  20.0));
    EXPECT_ERROR_START;
    efl_ui_range_limits_set(widget, -20.0, -20.0);
    EXPECT_ERROR_END;
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == -20.0);
-   ck_assert(max == 20.0);
+   ck_assert(EINA_DBL_EQ(min,  -20.0));
+   ck_assert(EINA_DBL_EQ(max,  20.0));
 
    EXPECT_ERROR_START;
    efl_ui_range_limits_set(widget, 2.0, -20.0);
    EXPECT_ERROR_END;
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == -20.0);
-   ck_assert(max == 20.0);
+   ck_assert(EINA_DBL_EQ(min,  -20.0));
+   ck_assert(EINA_DBL_EQ(max,  20.0));
 
    EXPECT_ERROR_START;
    efl_ui_range_limits_set(widget, 25.0, 20.0);
    EXPECT_ERROR_END;
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == -20.0);
-   ck_assert(max == 20.0);
+   ck_assert(EINA_DBL_EQ(min,  -20.0));
+   ck_assert(EINA_DBL_EQ(max,  20.0));
 
    efl_ui_range_limits_set(widget, -25.0, -20.0);
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == -25.0);
-   ck_assert(max == -20.0);
+   ck_assert(EINA_DBL_EQ(min,  -25.0));
+   ck_assert(EINA_DBL_EQ(max,  -20.0));
 
    efl_ui_range_limits_set(widget, 20.0, 25.0);
    efl_ui_range_limits_get(widget, &min, &max);
-   ck_assert(min == 20.0);
-   ck_assert(max == 25.0);
+   ck_assert(EINA_DBL_EQ(min,  20.0));
+   ck_assert(EINA_DBL_EQ(max,  25.0));
 }
 EFL_END_TEST
 
@@ -76,7 +76,7 @@ EFL_START_TEST(value_setting)
    for (i = -20.0; i <= 20.0; ++i)
      {
         efl_ui_range_value_set(widget, i);
-        ck_assert(efl_ui_range_value_get(widget) == i);
+        ck_assert(EINA_DBL_EQ(efl_ui_range_value_get(widget), i));
      }
 }
 EFL_END_TEST
diff --git a/src/tests/elementary/spec/efl_test_range_interactive.c b/src/tests/elementary/spec/efl_test_range_interactive.c
index c900524120..76b266dab0 100644
--- a/src/tests/elementary/spec/efl_test_range_interactive.c
+++ b/src/tests/elementary/spec/efl_test_range_interactive.c
@@ -16,18 +16,18 @@
 EFL_START_TEST(step_setting)
 {
    efl_ui_range_step_set(widget, 20.0);
-   ck_assert(efl_ui_range_step_get(widget) == 20.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_step_get(widget), 20.0));
    efl_ui_range_step_set(widget, 100.0);
-   ck_assert(efl_ui_range_step_get(widget) == 100.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_step_get(widget), 100.0));
 
    EXPECT_ERROR_START;
    efl_ui_range_step_set(widget, 0.0);
-   ck_assert(efl_ui_range_step_get(widget) == 100.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_step_get(widget), 100.0));
    EXPECT_ERROR_END;
 
    EXPECT_ERROR_START;
    efl_ui_range_step_set(widget, -20.0);
-   ck_assert(efl_ui_range_step_get(widget) == 100.0);
+   ck_assert(EINA_DBL_EQ(efl_ui_range_step_get(widget), 100.0));
    EXPECT_ERROR_END;
 }
 EFL_END_TEST
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index ae213b5a28..5e05da98c0 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -639,7 +639,7 @@ EFL_START_TEST(eolian_simple_parsing)
    fail_if(!expr);
    v = eolian_expression_eval(expr, EOLIAN_MASK_FLOAT);
    fail_if(v.type != EOLIAN_EXPR_DOUBLE);
-   fail_if(v.value.d != 1337.6);
+   fail_if(!EINA_DBL_EQ(v.value.d, 1337.6));
    fail_if(!(eina_iterator_next(iter, (void**)&param)));
    fail_if(eolian_parameter_direction_get(param) != EOLIAN_PARAMETER_IN);
    fail_if(strcmp(eolian_type_short_name_get(eolian_parameter_type_get(param)), "int"));
diff --git a/src/tests/evas/efl_canvas_animation.c b/src/tests/evas/efl_canvas_animation.c
index 19b47a6429..61fc264b69 100644
--- a/src/tests/evas/efl_canvas_animation.c
+++ b/src/tests/evas/efl_canvas_animation.c
@@ -38,7 +38,7 @@ EFL_START_TEST(efl_canvas_animation_default_value)
 {
    Efl_Canvas_Animation *animation = efl_new(EFL_CANVAS_ANIMATION_CLASS);
 
-   fail_if(efl_animation_duration_get(animation) == 0.0);
+   fail_if(EINA_DBL_EQ(efl_animation_duration_get(animation), 0.0));
 }
 EFL_END_TEST
 
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index f77e16a671..87c09e0961 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -448,7 +448,7 @@ EFL_START_TEST(evas_filter_state_test)
            "state render test failed: %p (%#x)", pixels, pixels ? *pixels : 0);
 
    efl_gfx_filter_state_get(to, &s1, &v1, &s2, &v2, &p);
-   fail_unless(strequal(s1, "state1") && strequal(s2, "state2") && (v1 == 0.0) && (v2 == 1.0) && (p == 0.5),
+   fail_unless(strequal(s1, "state1") && strequal(s2, "state2") && EINA_DBL_EQ(v1, 0.0) && EINA_DBL_EQ(v2, 1.0) && EINA_DBL_EQ(p, 0.5),
                "got: %s %f %s %f %f", s1, v1, s2, v2, p);
 
    /* data test */
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index 929c88ddab..6f29807216 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -265,7 +265,7 @@ EFL_START_TEST(evas_text_ellipsis)
    _test_ellipsis(to, buf, font, size, 1.0);
 
    /* Check ellipsis value with NULL */
-   fail_if(evas_object_text_ellipsis_get(NULL) != -1.0);
+   fail_if(!EINA_DBL_EQ(evas_object_text_ellipsis_get(NULL), -1.0));
 
    END_TEXT_TEST();
 }
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index d26b8fc7b9..bfaade63fb 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -3826,15 +3826,15 @@ EFL_START_TEST(evas_textblock_set_get)
    fail_if(strcmp(evas_object_textblock_replace_char_get(tb), "ש"));
 
    evas_object_textblock_valign_set(tb, -1.0);
-   fail_if(evas_object_textblock_valign_get(tb) != 0.0);
+   fail_if(EINA_DBL_NONZERO(evas_object_textblock_valign_get(tb)));
    evas_object_textblock_valign_set(tb, 0.0);
-   fail_if(evas_object_textblock_valign_get(tb) != 0.0);
+   fail_if(EINA_DBL_NONZERO(evas_object_textblock_valign_get(tb)));
    evas_object_textblock_valign_set(tb, 0.432);
-   fail_if(evas_object_textblock_valign_get(tb) != 0.432);
+   fail_if(!EINA_DBL_EQ(evas_object_textblock_valign_get(tb), 0.432));
    evas_object_textblock_valign_set(tb, 1.0);
-   fail_if(evas_object_textblock_valign_get(tb) != 1.0);
+   fail_if(!EINA_DBL_EQ(evas_object_textblock_valign_get(tb), 1.0));
    evas_object_textblock_valign_set(tb, 1.5);
-   fail_if(evas_object_textblock_valign_get(tb) != 1.0);
+   fail_if(!EINA_DBL_EQ(evas_object_textblock_valign_get(tb), 1.0));
 
    evas_object_textblock_bidi_delimiters_set(tb, ",.|");
    fail_if(strcmp(evas_object_textblock_bidi_delimiters_get(tb), ",.|"));