diff --git a/legacy/eobj/src/tests/access/Makefile.am b/legacy/eobj/src/tests/access/Makefile.am
index a6d1475640..aa220d9eb2 100644
--- a/legacy/eobj/src/tests/access/Makefile.am
+++ b/legacy/eobj/src/tests/access/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = access
+check_PROGRAMS = access
 
 access_SOURCES = \
 inherit.c \
diff --git a/legacy/eobj/src/tests/composite_objects/Makefile.am b/legacy/eobj/src/tests/composite_objects/Makefile.am
index 0b37eabc6d..9dc4d1bb9e 100644
--- a/legacy/eobj/src/tests/composite_objects/Makefile.am
+++ b/legacy/eobj/src/tests/composite_objects/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = composite_objects
+check_PROGRAMS = composite_objects
 
 composite_objects_SOURCES = \
 comp.c \
diff --git a/legacy/eobj/src/tests/constructors/Makefile.am b/legacy/eobj/src/tests/constructors/Makefile.am
index 0d37c60de3..ad7e3bf100 100644
--- a/legacy/eobj/src/tests/constructors/Makefile.am
+++ b/legacy/eobj/src/tests/constructors/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = constructors
+check_PROGRAMS = constructors
 
 constructors_SOURCES = \
 main.c \
diff --git a/legacy/eobj/src/tests/eo_suite/Makefile.am b/legacy/eobj/src/tests/eo_suite/Makefile.am
index 5e3ddfe350..3d0a9722df 100644
--- a/legacy/eobj/src/tests/eo_suite/Makefile.am
+++ b/legacy/eobj/src/tests/eo_suite/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
 @EO_CFLAGS@ \
 @CHECK_CFLAGS@
 
-if EFL_ENABLE_TESTS
-
 check_PROGRAMS = eo_suite
 
 eo_suite_SOURCES = \
@@ -22,5 +20,3 @@ eo_test_general.c \
 eo_test_init.c
 
 eo_suite_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@ @CHECK_LIBS@
-
-endif
diff --git a/legacy/eobj/src/tests/function_overrides/Makefile.am b/legacy/eobj/src/tests/function_overrides/Makefile.am
index 90c9582b04..915dd3308d 100644
--- a/legacy/eobj/src/tests/function_overrides/Makefile.am
+++ b/legacy/eobj/src/tests/function_overrides/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = function_overrides
+check_PROGRAMS = function_overrides
 
 function_overrides_SOURCES = \
 inherit.c \
diff --git a/legacy/eobj/src/tests/interface/Makefile.am b/legacy/eobj/src/tests/interface/Makefile.am
index fa927fb1bf..4544ae5cd1 100644
--- a/legacy/eobj/src/tests/interface/Makefile.am
+++ b/legacy/eobj/src/tests/interface/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = interface
+check_PROGRAMS = interface
 
 interface_SOURCES = \
 interface.c \
diff --git a/legacy/eobj/src/tests/mixin/Makefile.am b/legacy/eobj/src/tests/mixin/Makefile.am
index fd034916d0..0e6622cf51 100644
--- a/legacy/eobj/src/tests/mixin/Makefile.am
+++ b/legacy/eobj/src/tests/mixin/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = mixin
+check_PROGRAMS = mixin
 
 mixin_SOURCES = \
 inherit.c \
diff --git a/legacy/eobj/src/tests/signals/Makefile.am b/legacy/eobj/src/tests/signals/Makefile.am
index 895e114b83..4a12cca826 100644
--- a/legacy/eobj/src/tests/signals/Makefile.am
+++ b/legacy/eobj/src/tests/signals/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 @EFL_EO_BUILD@ \
 @EO_CFLAGS@
 
-noinst_PROGRAMS = signals
+check_PROGRAMS = signals
 
 signals_SOURCES = \
 main.c \