diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index b58bc9f3b5..4e6b46a8af 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -11,7 +11,7 @@ lib/eo/eo.c \
 lib/eo/eo_base_class.c \
 lib/eo/eo_private.h
 
-lib_eo_libeo_la_CPPFLAGS = -DNDEBUG @EO_CFLAGS@
+lib_eo_libeo_la_CPPFLAGS = @EO_CFLAGS@
 lib_eo_libeo_la_LIBADD = @EO_LIBS@
 lib_eo_libeo_la_DEPENDENCIES = @EO_INTERNAL_LIBS@
 lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
@@ -85,7 +85,6 @@ tests/eo/suite/eo_test_class_errors.c \
 tests/eo/suite/eo_test_general.c \
 tests/eo/suite/eo_test_init.c
 tests_eo_eo_suite_CPPFLAGS = \
--DNDEBUG \
 @CHECK_CFLAGS@ \
 @EO_CFLAGS@
 TESTS += tests/eo/eo_suite
@@ -103,8 +102,7 @@ tests/eo/function_overrides/function_overrides_inherit3.h \
 tests/eo/function_overrides/function_overrides_main.c \
 tests/eo/function_overrides/function_overrides_simple.c \
 tests/eo/function_overrides/function_overrides_simple.h
-tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@ \
--DNDEBUG
+tests_eo_test_function_overrides_CPPFLAGS = @EO_CFLAGS@
 tests_eo_test_function_overrides_LDADD = @USE_EO_LIBS@
 tests_eo_test_function_overrides_DEPENDENCIES = @USE_EO_INTERNAL_LIBS@
 TESTS += tests/eo/test_function_overrides
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 890a9c1f16..e38a9771cd 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -39,7 +39,7 @@ struct _Eo {
      Eina_Inlist *children;
      const Eo_Class *klass;
      int refcount;
-#ifndef NDEBUG
+#ifdef EO_DEBUG
      Eina_Inlist *xrefs;
 #endif
 
@@ -341,7 +341,7 @@ _eo_kls_itr_func_get(Eo_Kls_Itr *mro_itr, Eo_Op op)
 static Eina_Bool
 _eo_op_internal(Eo *obj, Eo_Op_Type op_type, Eo_Op op, va_list *p_list)
 {
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    const Eo_Op_Description *op_desc = _eo_op_id_desc_get(op);
 
    if (op_desc)
@@ -468,7 +468,7 @@ eo_do_super_internal(Eo *obj, Eo_Op_Type op_type, Eo_Op op, ...)
 static Eina_Bool
 _eo_class_op_internal(Eo_Class *klass, Eo_Op op, va_list *p_list)
 {
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    const Eo_Op_Description *op_desc = _eo_op_id_desc_get(op);
 
    if (op_desc)
@@ -582,7 +582,7 @@ _eo_class_base_op_init(Eo_Class *klass)
    klass->chain = calloc(klass->chain_size, sizeof(*klass->chain));
 }
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
 static Eina_Bool
 _eo_class_mro_has(const Eo_Class *klass, const Eo_Class *find)
 {
@@ -1185,7 +1185,7 @@ eo_xref_internal(Eo *obj, const Eo *ref_obj, const char *file, int line)
 
    _eo_ref(obj);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    Eo_Xref_Node *xref = calloc(1, sizeof(*xref));
    xref->ref_obj = ref_obj;
    xref->file = file;
@@ -1205,7 +1205,7 @@ EAPI void
 eo_xunref(Eo *obj, const Eo *ref_obj)
 {
    EO_MAGIC_RETURN(obj, EO_EINA_MAGIC);
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    Eo_Xref_Node *xref = NULL;
    EINA_INLIST_FOREACH(obj->xrefs, xref)
      {
@@ -1309,7 +1309,7 @@ _eo_unref(Eo *obj)
 
         _eo_del_internal(obj);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
         /* If for some reason it's not empty, clear it. */
         while (obj->xrefs)
           {
@@ -1430,7 +1430,7 @@ eo_data_get(const Eo *obj, const Eo_Class *klass)
    EO_MAGIC_RETURN_VAL(obj, EO_EINA_MAGIC, NULL);
    EO_MAGIC_RETURN_VAL(klass, EO_CLASS_EINA_MAGIC, NULL);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    if (!_eo_class_mro_has(obj->klass, klass))
      {
         ERR("Tried getting data of class '%s' from object of class '%s', but the former is not a direct inheritance of the latter.", klass->desc->name, obj->klass->desc->name);
@@ -1440,7 +1440,7 @@ eo_data_get(const Eo *obj, const Eo_Class *klass)
 
    ret = _eo_data_get(obj, klass);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    if (!ret && (klass->desc->data_size == 0))
      {
         ERR("Tried getting data of class '%s', but it has none..", klass->desc->name);
@@ -1481,7 +1481,7 @@ eo_init(void)
    eina_magic_string_static_set(EO_CLASS_EINA_MAGIC,
          EO_CLASS_EINA_MAGIC_STR);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    /* Call it just for coverage purposes. Ugly I know, but I like it better than
     * casting everywhere else. */
    _eo_class_isa_func(NULL, NULL, NULL);
diff --git a/src/tests/eo/function_overrides/function_overrides_main.c b/src/tests/eo/function_overrides/function_overrides_main.c
index ae372c5e87..49a450edf8 100644
--- a/src/tests/eo/function_overrides/function_overrides_main.c
+++ b/src/tests/eo/function_overrides/function_overrides_main.c
@@ -43,7 +43,7 @@ main(int argc, char *argv[])
 
    fail_if(eo_do_super(obj, simple_a_print()));
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    fail_if(eo_do(obj, simple_class_print()));
 #endif
 
@@ -52,7 +52,7 @@ main(int argc, char *argv[])
    fail_if(!eo_class_do(INHERIT2_CLASS, simple_class_print()));
    fail_if(!eo_class_do(INHERIT3_CLASS, simple_class_print()));
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    fail_if(eo_class_do(SIMPLE_CLASS, simple_a_print()));
 #endif
 
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index f7a61c63be..d340907805 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -45,7 +45,7 @@ START_TEST(eo_data_fetch)
 
    Eo *obj = eo_add(klass, NULL);
    fail_if(!obj);
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    fail_if(eo_data_get(obj, SIMPLE_CLASS));
 #endif
    eo_unref(obj);
@@ -292,7 +292,7 @@ START_TEST(eo_refs)
    eo_xunref(obj, obj3);
    fail_if(eo_ref_get(obj) != 1);
 
-#ifndef NDEBUG
+#ifdef EO_DEBUG
    eo_xunref(obj, obj3);
    fail_if(eo_ref_get(obj) != 1);