diff --git a/src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc b/src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc
index b321018601..5ad5da5015 100644
--- a/src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc
+++ b/src/tests/ecore_cxx/ecore_cxx_test_safe_call.cc
@@ -36,7 +36,7 @@ void call_async(efl::eina::mutex& mutex, efl::eina::condition_variable& cond, in
     );
 }
 
-START_TEST(ecore_cxx_safe_call_async)
+EFL_START_TEST(ecore_cxx_safe_call_async)
 {
   efl::ecore::ecore_init init;
 
@@ -65,7 +65,7 @@ START_TEST(ecore_cxx_safe_call_async)
   ::eina_error_set(0);
   std::cout << "end of ecore_cxx_safe_call_async" << std::endl;
 }
-END_TEST
+EFL_END_TEST
 
 struct big_pod
 {
@@ -244,7 +244,7 @@ void call_sync_int()
   ck_assert(constructor_called == destructor_called);
 }
 
-START_TEST(ecore_cxx_safe_call_sync)
+EFL_START_TEST(ecore_cxx_safe_call_sync)
 {
   efl::ecore::ecore_init init;
 
@@ -256,7 +256,7 @@ START_TEST(ecore_cxx_safe_call_sync)
 
   thread.join();
 }
-END_TEST
+EFL_END_TEST
 
 void
 ecore_cxx_test_safe_call(TCase* tc)
diff --git a/src/tests/eet_cxx/eet_cxx_test_descriptors.cc b/src/tests/eet_cxx/eet_cxx_test_descriptors.cc
index 4dd4cf9699..98ae254ad4 100644
--- a/src/tests/eet_cxx/eet_cxx_test_descriptors.cc
+++ b/src/tests/eet_cxx/eet_cxx_test_descriptors.cc
@@ -15,7 +15,7 @@ struct pod_type
   char c;
 };
 
-START_TEST(eet_cxx_descriptors)
+EFL_START_TEST(eet_cxx_descriptors)
 {
   efl::eet::eet_init init;
 
@@ -41,7 +41,7 @@ START_TEST(eet_cxx_descriptors)
 
   eet_close(file);
 }
-END_TEST
+EFL_END_TEST
 
 int constructors_called = 0
     , destructors_called = 0;
@@ -65,7 +65,7 @@ struct non_pod
   int i;
 };
 
-START_TEST(eet_cxx_descriptors_non_pod)
+EFL_START_TEST(eet_cxx_descriptors_non_pod)
 {
   efl::eet::eet_init init;
 
@@ -98,7 +98,7 @@ START_TEST(eet_cxx_descriptors_non_pod)
 
   ck_assert(constructors_called == destructors_called);
 }
-END_TEST
+EFL_END_TEST
 
 struct pod_composited
 {
@@ -115,7 +115,7 @@ struct pod_value_composited
   pod_type member;
 };
 
-START_TEST(eet_cxx_descriptors_composition)
+EFL_START_TEST(eet_cxx_descriptors_composition)
 {
   efl::eet::eet_init init;
 
@@ -222,7 +222,7 @@ START_TEST(eet_cxx_descriptors_composition)
   }
 
 }
-END_TEST
+EFL_END_TEST
 
 void
 eet_cxx_test_descriptors(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_accessor.cc b/src/tests/eina_cxx/eina_cxx_test_accessor.cc
index 864e0743c3..5978345dd8 100644
--- a/src/tests/eina_cxx/eina_cxx_test_accessor.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_accessor.cc
@@ -24,7 +24,7 @@ struct is_eolian_object< ::wrapper> : std::true_type {};
     
 } }
 
-START_TEST(eina_cxx_accessor_indexing)
+EFL_START_TEST(eina_cxx_accessor_indexing)
 {
   efl::eina::eina_init eina_init;
 
@@ -41,9 +41,9 @@ START_TEST(eina_cxx_accessor_indexing)
   ck_assert(accessor[2] == 15);
   ck_assert(accessor[3] == 20);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_eo_accessor_indexing)
+EFL_START_TEST(eina_cxx_eo_accessor_indexing)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -67,9 +67,9 @@ START_TEST(eina_cxx_eo_accessor_indexing)
   ck_assert(accessor[2] == w3);
   ck_assert(accessor[3] == w4);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_accessor_iterator)
+EFL_START_TEST(eina_cxx_accessor_iterator)
 {
   efl::eina::eina_init eina_init;
 
@@ -95,9 +95,9 @@ START_TEST(eina_cxx_accessor_iterator)
       ck_assert(pos != 3u || *first == 20);
     }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_eo_accessor_iterator)
+EFL_START_TEST(eina_cxx_eo_accessor_iterator)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -130,9 +130,9 @@ START_TEST(eina_cxx_eo_accessor_iterator)
        ck_assert(pos != 3u || *first == w4);
     }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_accessor_relops)
+EFL_START_TEST(eina_cxx_accessor_relops)
 {
   efl::eina::eina_init eina_init;
 
@@ -183,7 +183,7 @@ START_TEST(eina_cxx_accessor_relops)
   ck_assert(fourth >= first); ck_assert(fourth >= second);
   ck_assert(fourth >= third); ck_assert(fourth >= fourth);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_accessor(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_error.cc b/src/tests/eina_cxx/eina_cxx_test_error.cc
index c0ba0833d1..7970ab4921 100644
--- a/src/tests/eina_cxx/eina_cxx_test_error.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_error.cc
@@ -8,7 +8,7 @@
 
 Eina_Error my_error, my_error_2;
 
-START_TEST(eina_cxx_get_error)
+EFL_START_TEST(eina_cxx_get_error)
 {
   efl::eina::eina_init eina_init;
 
@@ -33,9 +33,9 @@ START_TEST(eina_cxx_get_error)
 
   ck_assert(ec3.message() == strerror(ENOMEM));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_throw_on_error)
+EFL_START_TEST(eina_cxx_throw_on_error)
 {
   efl::eina::eina_init eina_init;
 
@@ -65,7 +65,7 @@ START_TEST(eina_cxx_throw_on_error)
       ck_assert(!efl::eina::get_error_code());
     }
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_error(TCase *tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_inarray.cc b/src/tests/eina_cxx/eina_cxx_test_inarray.cc
index 2792c19168..57f7c6397e 100644
--- a/src/tests/eina_cxx/eina_cxx_test_inarray.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_inarray.cc
@@ -9,7 +9,7 @@
 
 #include "eina_cxx_suite.h"
 
-START_TEST(eina_cxx_inarray_pod_push_back)
+EFL_START_TEST(eina_cxx_inarray_pod_push_back)
 {
   efl::eina::eina_init eina_init;
 
@@ -28,9 +28,9 @@ START_TEST(eina_cxx_inarray_pod_push_back)
   ck_assert(std::equal(array.begin(), array.end(), result));
   ck_assert(std::equal(array.rbegin(), array.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_pod_pop_back)
+EFL_START_TEST(eina_cxx_inarray_pod_pop_back)
 {
   efl::eina::eina_init eina_init;
 
@@ -48,9 +48,9 @@ START_TEST(eina_cxx_inarray_pod_pop_back)
   ck_assert(std::equal(array.begin(), array.end(), result));
   ck_assert(std::equal(array.rbegin(), array.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_pod_insert)
+EFL_START_TEST(eina_cxx_inarray_pod_insert)
 {
   efl::eina::eina_init eina_init;
 
@@ -103,9 +103,9 @@ START_TEST(eina_cxx_inarray_pod_insert)
   ck_assert(array4.back() == 1);
   ck_assert(std::equal(array.begin(), array.end(), array4.begin()));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_pod_constructors)
+EFL_START_TEST(eina_cxx_inarray_pod_constructors)
 {
   efl::eina::eina_init eina_init;
 
@@ -123,9 +123,9 @@ START_TEST(eina_cxx_inarray_pod_constructors)
   efl::eina::inarray<int> array4(array2.begin(), array2.end());
   ck_assert(array2 == array4);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_pod_erase)
+EFL_START_TEST(eina_cxx_inarray_pod_erase)
 {
   efl::eina::eina_init eina_init;
 
@@ -165,7 +165,7 @@ START_TEST(eina_cxx_inarray_pod_erase)
   ck_assert(array1.front() == 10);
   ck_assert(array1.back() == 25);
 }
-END_TEST
+EFL_END_TEST
 
 unsigned int constructors_called = 0u;
 unsigned int destructors_called = 0u;
@@ -202,7 +202,7 @@ bool operator==(non_pod lhs, non_pod rhs)
   return *lhs.x == *rhs.x;
 }
 
-START_TEST(eina_cxx_inarray_nonpod_push_back)
+EFL_START_TEST(eina_cxx_inarray_nonpod_push_back)
 {
   efl::eina::eina_init eina_init;
   {
@@ -224,9 +224,9 @@ START_TEST(eina_cxx_inarray_nonpod_push_back)
   ck_assert(::constructors_called == ::destructors_called);
   ::constructors_called = ::destructors_called = 0;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_nonpod_pop_back)
+EFL_START_TEST(eina_cxx_inarray_nonpod_pop_back)
 {
   {
     efl::eina::eina_init eina_init;
@@ -250,9 +250,9 @@ START_TEST(eina_cxx_inarray_nonpod_pop_back)
   ck_assert(::constructors_called == ::destructors_called);
   ::constructors_called = ::destructors_called = 0;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_nonpod_insert)
+EFL_START_TEST(eina_cxx_inarray_nonpod_insert)
 {
   {
     efl::eina::eina_init eina_init;
@@ -311,9 +311,9 @@ START_TEST(eina_cxx_inarray_nonpod_insert)
   ck_assert(::constructors_called == ::destructors_called);
   ::constructors_called = ::destructors_called = 0;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_nonpod_constructors)
+EFL_START_TEST(eina_cxx_inarray_nonpod_constructors)
 {
   {
     efl::eina::eina_init eina_init;
@@ -337,9 +337,9 @@ START_TEST(eina_cxx_inarray_nonpod_constructors)
   ck_assert(::constructors_called == ::destructors_called);
   ::constructors_called = ::destructors_called = 0;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_nonpod_erase)
+EFL_START_TEST(eina_cxx_inarray_nonpod_erase)
 {
   {
     efl::eina::eina_init eina_init;
@@ -385,9 +385,9 @@ START_TEST(eina_cxx_inarray_nonpod_erase)
   ck_assert(::constructors_called == ::destructors_called);
   ::constructors_called = ::destructors_called = 0;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_range_inarray)
+EFL_START_TEST(eina_cxx_range_inarray)
 {
   efl::eina::eina_init eina_init;
 
@@ -418,9 +418,9 @@ START_TEST(eina_cxx_range_inarray)
 
   ck_assert(range_array[0] == 0);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inarray_from_c)
+EFL_START_TEST(eina_cxx_inarray_from_c)
 {
   efl::eina::eina_init eina_init;
 
@@ -439,7 +439,7 @@ START_TEST(eina_cxx_inarray_from_c)
   ck_assert(eina_inarray_count(c_array) == 3);
   efl::eina::inarray<int> array(c_array);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_inarray(TCase *tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_inlist.cc b/src/tests/eina_cxx/eina_cxx_test_inlist.cc
index 717eb0c70f..e941e5339a 100644
--- a/src/tests/eina_cxx/eina_cxx_test_inlist.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_inlist.cc
@@ -14,7 +14,7 @@ struct Eina_Test_Inlist
    EINA_INLIST;
 };
 
-START_TEST(eina_cxx_inlist_push_back)
+EFL_START_TEST(eina_cxx_inlist_push_back)
 {
   efl::eina::eina_init eina_init;
 
@@ -31,9 +31,9 @@ START_TEST(eina_cxx_inlist_push_back)
   ck_assert(std::equal(list.begin(), list.end(), result));
   ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_pop_back)
+EFL_START_TEST(eina_cxx_inlist_pop_back)
 {
   efl::eina::eina_init eina_init;
 
@@ -51,9 +51,9 @@ START_TEST(eina_cxx_inlist_pop_back)
   ck_assert(std::equal(list.begin(), list.end(), result));
   ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_push_front)
+EFL_START_TEST(eina_cxx_inlist_push_front)
 {
   efl::eina::eina_init eina_init;
 
@@ -70,9 +70,9 @@ START_TEST(eina_cxx_inlist_push_front)
   ck_assert(std::equal(list.begin(), list.end(), result));
   ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_pop_front)
+EFL_START_TEST(eina_cxx_inlist_pop_front)
 {
   efl::eina::eina_init eina_init;
 
@@ -90,9 +90,9 @@ START_TEST(eina_cxx_inlist_pop_front)
   ck_assert(std::equal(list.begin(), list.end(), result));
   ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_insert)
+EFL_START_TEST(eina_cxx_inlist_insert)
 {
   efl::eina::eina_init eina_init;
 
@@ -145,9 +145,9 @@ START_TEST(eina_cxx_inlist_insert)
   ck_assert(list4.back() == 1);
   ck_assert(std::equal(list.begin(), list.end(), list4.begin()));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_constructors)
+EFL_START_TEST(eina_cxx_inlist_constructors)
 {
   efl::eina::eina_init eina_init;
 
@@ -165,9 +165,9 @@ START_TEST(eina_cxx_inlist_constructors)
   efl::eina::inlist<int> list4(list2.begin(), list2.end());
   ck_assert(list2 == list4);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_erase)
+EFL_START_TEST(eina_cxx_inlist_erase)
 {
   efl::eina::eina_init eina_init;
 
@@ -215,9 +215,9 @@ START_TEST(eina_cxx_inlist_erase)
   ck_assert(list1.front() == 10);
   ck_assert(list1.back() == 25);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_range)
+EFL_START_TEST(eina_cxx_inlist_range)
 {
   efl::eina::eina_init eina_init;
 
@@ -248,9 +248,9 @@ START_TEST(eina_cxx_inlist_range)
   ck_assert(*const_range_list.begin() == 0);
   ck_assert(*list.begin() == 0);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_inlist_from_c)
+EFL_START_TEST(eina_cxx_inlist_from_c)
 {
   efl::eina::eina_init eina_init;
 
@@ -273,7 +273,7 @@ START_TEST(eina_cxx_inlist_from_c)
    while (c_list)
       c_list = eina_inlist_remove(c_list, c_list);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_inlist(TCase *tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_iterator.cc b/src/tests/eina_cxx/eina_cxx_test_iterator.cc
index 6cbd98198a..b10d5617fe 100644
--- a/src/tests/eina_cxx/eina_cxx_test_iterator.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_iterator.cc
@@ -10,7 +10,7 @@
 #include "eina_cxx_suite.h"
 #include "simple.eo.hh"
 
-START_TEST(eina_cxx_iterator_equal)
+EFL_START_TEST(eina_cxx_iterator_equal)
 {
   efl::eina::eina_init eina_init;
 
@@ -30,9 +30,9 @@ START_TEST(eina_cxx_iterator_equal)
 
   ck_assert(std::equal(iterator, last_iterator, result));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_eo_iterator_equal)
+EFL_START_TEST(eina_cxx_eo_iterator_equal)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -56,7 +56,7 @@ START_TEST(eina_cxx_eo_iterator_equal)
 
   ck_assert(std::equal(iterator, last_iterator, result));
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_iterator(TCase *tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_log.cc b/src/tests/eina_cxx/eina_cxx_test_log.cc
index 6e51780dde..e83074f48c 100644
--- a/src/tests/eina_cxx/eina_cxx_test_log.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_log.cc
@@ -14,7 +14,7 @@ int expensive_call()
   return 11;
 }
 
-START_TEST(eina_cxx_level_log)
+EFL_START_TEST(eina_cxx_level_log)
 {
   efl::eina::eina_init init;
 
@@ -31,9 +31,9 @@ START_TEST(eina_cxx_level_log)
   domain.set_level(efl::eina::log_level::error);
   ck_assert(domain.get_level() == ::EINA_LOG_LEVEL_ERR);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_expensive_log)
+EFL_START_TEST(eina_cxx_expensive_log)
 {
   efl::eina::eina_init init;
 
@@ -44,9 +44,9 @@ START_TEST(eina_cxx_expensive_log)
   EINA_CXX_DOM_LOG_ERR(domain) << "foo " << ::expensive_call();
   ck_assert(!expensive_called);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_domain_log)
+EFL_START_TEST(eina_cxx_domain_log)
 {
   efl::eina::eina_init init;
 
@@ -64,9 +64,9 @@ START_TEST(eina_cxx_domain_log)
   EINA_CXX_LOG_DBG() << "foo " << 5;
   EINA_CXX_LOG_WARN() << "foo " << 5;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_default_domain_log)
+EFL_START_TEST(eina_cxx_default_domain_log)
 {
   efl::eina::eina_init init;
 
@@ -76,9 +76,9 @@ START_TEST(eina_cxx_default_domain_log)
   EINA_CXX_DOM_LOG_DBG(efl::eina::default_domain) << "foo " << 5;
   EINA_CXX_DOM_LOG_WARN(efl::eina::default_domain) << "foo " << 5;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_global_domain_log)
+EFL_START_TEST(eina_cxx_global_domain_log)
 {
   efl::eina::eina_init init;
 
@@ -90,7 +90,7 @@ START_TEST(eina_cxx_global_domain_log)
   EINA_CXX_DOM_LOG_DBG(efl::eina::global_domain) << "foo " << 5;
   EINA_CXX_DOM_LOG_WARN(efl::eina::global_domain) << "foo " << 5;
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_log(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_optional.cc b/src/tests/eina_cxx/eina_cxx_test_optional.cc
index 31e9ffe12b..381198c288 100644
--- a/src/tests/eina_cxx/eina_cxx_test_optional.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_optional.cc
@@ -19,7 +19,7 @@ struct nonpod
   ~nonpod() { nonpod_destructed++; }
 };
 
-START_TEST(eina_cxx_optional_constructors)
+EFL_START_TEST(eina_cxx_optional_constructors)
 {
   namespace eina = efl::eina;
 
@@ -56,9 +56,9 @@ START_TEST(eina_cxx_optional_constructors)
             << " nonpod_destructed " << nonpod_destructed << std::endl;
   ck_assert(::nonpod_constructed == ::nonpod_destructed);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_optional_rel_ops)
+EFL_START_TEST(eina_cxx_optional_rel_ops)
 {
   namespace eina = efl::eina;
 
@@ -87,9 +87,9 @@ START_TEST(eina_cxx_optional_rel_ops)
   ck_assert(!(one != one));
   ck_assert(!(one != one_again));
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_optional_assignment)
+EFL_START_TEST(eina_cxx_optional_assignment)
 {
   namespace eina = efl::eina;
 
@@ -132,9 +132,9 @@ START_TEST(eina_cxx_optional_assignment)
 
   assert(a); assert(!b); assert(c); assert(d);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_optional_convertible_types)
+EFL_START_TEST(eina_cxx_optional_convertible_types)
 {
   namespace eina = efl::eina;
 
@@ -184,7 +184,7 @@ START_TEST(eina_cxx_optional_convertible_types)
   fail_if(*b != *b_s);
   fail_if(*c != *c_s);
 }
-END_TEST
+EFL_END_TEST
 
 
 void
diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc
index f5d24474f1..2cc1d2f85f 100644
--- a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc
@@ -25,7 +25,7 @@ struct is_eolian_object< ::wrapper> : std::true_type {};
     
 } }
 
-START_TEST(eina_cxx_ptrarray_push_back)
+EFL_START_TEST(eina_cxx_ptrarray_push_back)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -74,9 +74,9 @@ START_TEST(eina_cxx_ptrarray_push_back)
     ck_assert(std::equal(array.rbegin(), array.rend(), rresult_));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrarray_pop_back)
+EFL_START_TEST(eina_cxx_ptrarray_pop_back)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -128,9 +128,9 @@ START_TEST(eina_cxx_ptrarray_pop_back)
     ck_assert(std::equal(array.rbegin(), array.rend(), rresult_));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrarray_insert)
+EFL_START_TEST(eina_cxx_ptrarray_insert)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -277,9 +277,9 @@ START_TEST(eina_cxx_ptrarray_insert)
     ck_assert(std::equal(array.begin(), array.end(), array4.begin()));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrarray_constructors)
+EFL_START_TEST(eina_cxx_ptrarray_constructors)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -319,9 +319,9 @@ START_TEST(eina_cxx_ptrarray_constructors)
     ck_assert(array2 == array4);
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrarray_erase)
+EFL_START_TEST(eina_cxx_ptrarray_erase)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -407,9 +407,9 @@ START_TEST(eina_cxx_ptrarray_erase)
     ck_assert(array1.back() == w5);
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrarray_range)
+EFL_START_TEST(eina_cxx_ptrarray_range)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -479,7 +479,7 @@ START_TEST(eina_cxx_ptrarray_range)
   //   ck_assert(*array.begin() == 0);
   }
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_ptrarray(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
index 82a1deeec8..9635c0efff 100644
--- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc
@@ -27,7 +27,7 @@ struct is_eolian_object< ::wrapper> : std::true_type {};
     
 } }
 
-START_TEST(eina_cxx_ptrlist_push_back)
+EFL_START_TEST(eina_cxx_ptrlist_push_back)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -74,9 +74,9 @@ START_TEST(eina_cxx_ptrlist_push_back)
     ck_assert(std::equal(list.rbegin(), list.rend(), rresult_));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_pop_back)
+EFL_START_TEST(eina_cxx_ptrlist_pop_back)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -128,9 +128,9 @@ START_TEST(eina_cxx_ptrlist_pop_back)
     ck_assert(std::equal(list.rbegin(), list.rend(), rresult_));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_push_front)
+EFL_START_TEST(eina_cxx_ptrlist_push_front)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -168,9 +168,9 @@ START_TEST(eina_cxx_ptrlist_push_front)
     ck_assert(std::equal(list.rbegin(), list.rend(), rresult));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_pop_front)
+EFL_START_TEST(eina_cxx_ptrlist_pop_front)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -222,9 +222,9 @@ START_TEST(eina_cxx_ptrlist_pop_front)
     ck_assert(std::equal(list.rbegin(), list.rend(), rresult_));
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_insert)
+EFL_START_TEST(eina_cxx_ptrlist_insert)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -336,10 +336,10 @@ START_TEST(eina_cxx_ptrlist_insert)
     ck_assert(std::equal(list.begin(), list.end(), list4.begin()));
   }
 }
-END_TEST
+EFL_END_TEST
 
 
-START_TEST(eina_cxx_ptrlist_malloc_clone_allocator)
+EFL_START_TEST(eina_cxx_ptrlist_malloc_clone_allocator)
 {
   efl::eina::eina_init eina_init;
 
@@ -349,9 +349,9 @@ START_TEST(eina_cxx_ptrlist_malloc_clone_allocator)
 
   efl::eina::ptr_list<int, efl::eina::malloc_clone_allocator> list2 = list1;
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_constructors)
+EFL_START_TEST(eina_cxx_ptrlist_constructors)
 {
   efl::eina::eina_init eina_init;
   efl::eo::eo_init eo_init;
@@ -399,9 +399,9 @@ START_TEST(eina_cxx_ptrlist_constructors)
     ck_assert(list2 == list4);
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_erase)
+EFL_START_TEST(eina_cxx_ptrlist_erase)
 {
   efl::eina::eina_init eina_init;
 
@@ -449,9 +449,9 @@ START_TEST(eina_cxx_ptrlist_erase)
   ck_assert(list1.front() == 10);
   ck_assert(list1.back() == 25);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_ptrlist_range)
+EFL_START_TEST(eina_cxx_ptrlist_range)
 {
   efl::eina::eina_init eina_init;
 
@@ -482,7 +482,7 @@ START_TEST(eina_cxx_ptrlist_range)
   ck_assert(*const_range_list.begin() == 0);
   ck_assert(*list.begin() == 0);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_ptrlist(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_stringshare.cc b/src/tests/eina_cxx/eina_cxx_test_stringshare.cc
index 11bce25c7f..84de56df26 100644
--- a/src/tests/eina_cxx/eina_cxx_test_stringshare.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_stringshare.cc
@@ -9,7 +9,7 @@
 
 #include "eina_cxx_suite.h"
 
-START_TEST(eina_cxx_stringshare_constructors)
+EFL_START_TEST(eina_cxx_stringshare_constructors)
 {
   efl::eina::eina_init eina_init;
 
@@ -26,9 +26,9 @@ START_TEST(eina_cxx_stringshare_constructors)
   efl::eina::stringshare string4(string3.begin(), string3.end());
   ck_assert(string2 == string3);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_stringshare_iterators)
+EFL_START_TEST(eina_cxx_stringshare_iterators)
 {
   efl::eina::eina_init eina_init;
 
@@ -44,7 +44,7 @@ START_TEST(eina_cxx_stringshare_iterators)
   ck_assert(std::equal(string.cbegin(), string.cend(), str));
   ck_assert(std::equal(string.crbegin(), string.crend(), rstr));
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_stringshare(TCase *tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_thread.cc b/src/tests/eina_cxx/eina_cxx_test_thread.cc
index f464c26667..b9900f0238 100644
--- a/src/tests/eina_cxx/eina_cxx_test_thread.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_thread.cc
@@ -33,7 +33,7 @@ void thread_2_arg(int a0, test t)
   ck_assert(t.x == 10);
 }
 
-START_TEST(eina_cxx_thread_constructors)
+EFL_START_TEST(eina_cxx_thread_constructors)
 {
   efl::eina::eina_init init;
   efl::eina::eina_threads_init threads_init;
@@ -61,9 +61,9 @@ START_TEST(eina_cxx_thread_constructors)
     ck_assert( ::args_2);
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_thread_mutexes)
+EFL_START_TEST(eina_cxx_thread_mutexes)
 {
   efl::eina::eina_init init;
   efl::eina::mutex m;
@@ -87,7 +87,7 @@ START_TEST(eina_cxx_thread_mutexes)
     efl::eina::lock_guard<efl::eina::mutex> lock1(m);
   }
 }
-END_TEST
+EFL_END_TEST
 
 bool b = false;
 
@@ -99,7 +99,7 @@ void condition_thread(efl::eina::mutex& condition_mutex
   condition_condition.notify_one();
 }
 
-START_TEST(eina_cxx_thread_conditional)
+EFL_START_TEST(eina_cxx_thread_conditional)
 {
   efl::eina::eina_init init;
   efl::eina::mutex m;
@@ -119,7 +119,7 @@ START_TEST(eina_cxx_thread_conditional)
 
   thread.join();
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_thread(TCase* tc)
diff --git a/src/tests/eina_cxx/eina_cxx_test_value.cc b/src/tests/eina_cxx/eina_cxx_test_value.cc
index d4864b6ac0..45f747a42a 100644
--- a/src/tests/eina_cxx/eina_cxx_test_value.cc
+++ b/src/tests/eina_cxx/eina_cxx_test_value.cc
@@ -6,7 +6,7 @@
 
 #include "eina_cxx_suite.h"
 
-START_TEST(eina_cxx_value_constructors)
+EFL_START_TEST(eina_cxx_value_constructors)
 {
   efl::eina::eina_init init;
 
@@ -38,9 +38,9 @@ START_TEST(eina_cxx_value_constructors)
 
   efl::eina::value vdouble(5.0);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_value_get)
+EFL_START_TEST(eina_cxx_value_get)
 {
   efl::eina::eina_init init;
 
@@ -81,9 +81,9 @@ START_TEST(eina_cxx_value_get)
   efl::eina::value vdouble(12.0);
   ck_assert(efl::eina::get<double>(vdouble) == 12.0f);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_value_wrong_get)
+EFL_START_TEST(eina_cxx_value_wrong_get)
 {
   efl::eina::eina_init init;
 
@@ -98,9 +98,9 @@ START_TEST(eina_cxx_value_wrong_get)
   {
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_value_comparison_operators)
+EFL_START_TEST(eina_cxx_value_comparison_operators)
 {
   efl::eina::eina_init init;
 
@@ -162,9 +162,9 @@ START_TEST(eina_cxx_value_comparison_operators)
   ck_assert(vfloat != vdouble);
   ck_assert(vdouble != vfloat);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_value_copying)
+EFL_START_TEST(eina_cxx_value_copying)
 {
   efl::eina::eina_init init;
   char c = 5;
@@ -182,14 +182,14 @@ START_TEST(eina_cxx_value_copying)
   ck_assert(efl::eina::get<int>(vchar) == 10);
   ck_assert(efl::eina::get<int>(vint) == 10);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eina_cxx_value_temporaries)
+EFL_START_TEST(eina_cxx_value_temporaries)
 {
   efl::eina::eina_init init;
   efl::eina::get<std::string>(efl::eina::value(std::string("Matroska")));
 }
-END_TEST
+EFL_END_TEST
 
 void
 eina_test_value(TCase* tc)
diff --git a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
index 485ea94c53..c7f66e5671 100644
--- a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
+++ b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_client.cc
@@ -29,7 +29,7 @@ on_name_request(std::error_code const& ec, efl::eldbus::const_message
      }
 }
 
-START_TEST(eldbus_cxx_client)
+EFL_START_TEST(eldbus_cxx_client)
 {
   namespace edb = efl::eldbus;
 
@@ -452,7 +452,7 @@ START_TEST(eldbus_cxx_client)
 
   std::cout << "out of loop" << std::endl;
 }
-END_TEST
+EFL_END_TEST
 
 void
 eldbus_test_client(TCase* tc)
diff --git a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc
index 494328f74f..134d85c404 100644
--- a/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc
+++ b/src/tests/eldbus_cxx/eldbus_cxx_test_eldbus_connect.cc
@@ -10,14 +10,14 @@
 
 #include "eldbus_cxx_suite.h"
 
-START_TEST(eldbus_cxx_session_connection)
+EFL_START_TEST(eldbus_cxx_session_connection)
 {
   efl::ecore::ecore_init ecore_init;
   efl::eldbus::eldbus_init init;
 
   efl::eldbus::connection c(efl::eldbus::session);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eldbus_test_connection(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
index f73de98f97..f6ef5a5747 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_address_of.cc
@@ -11,7 +11,7 @@
 
 #include "eolian_cxx_suite.h"
 
-START_TEST(eolian_cxx_test_addess_of_conversions)
+EFL_START_TEST(eolian_cxx_test_addess_of_conversions)
 {
    efl::eo::eo_init init;
 
@@ -26,7 +26,7 @@ START_TEST(eolian_cxx_test_addess_of_conversions)
    fail_unless(a_ptr == (void*) c_ptr);
    fail_unless(a_ptr == (void*) d_ptr);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_address_of(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
index 0804cd7599..e4d90202b5 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_binding.cc
@@ -11,7 +11,7 @@
 
 #include "eolian_cxx_suite.h"
 
-START_TEST(eolian_cxx_test_binding_constructor_only_required)
+EFL_START_TEST(eolian_cxx_test_binding_constructor_only_required)
 {
   efl::eo::eo_init init;
 
@@ -27,9 +27,9 @@ START_TEST(eolian_cxx_test_binding_constructor_only_required)
   ck_assert_int_eq(1, g.req_ctor_a_value_get());
   ck_assert_int_eq(2, g.req_ctor_b_value_get());
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_binding_constructor_all_optionals)
+EFL_START_TEST(eolian_cxx_test_binding_constructor_all_optionals)
 {
   efl::eo::eo_init i;
 
@@ -60,9 +60,9 @@ START_TEST(eolian_cxx_test_binding_constructor_all_optionals)
   ck_assert_int_eq(4, g.req_ctor_b_value_get());
   ck_assert_int_eq(5, g.opt_ctor_b_value_get());
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_type_generation)
+EFL_START_TEST(eolian_cxx_test_type_generation)
 {
   efl::eo::eo_init eo_init;
 
@@ -72,9 +72,9 @@ START_TEST(eolian_cxx_test_type_generation)
   name1::name2::Type_Generation g3(efl::eo::instantiate
                                    , [] (name1::name2::Type_Generation) {});
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_type_generation_in)
+EFL_START_TEST(eolian_cxx_test_type_generation_in)
 {
   efl::eo::eo_init i;
 
@@ -92,9 +92,9 @@ START_TEST(eolian_cxx_test_type_generation_in)
   g.instring("foobar");
   g.instringown("foobar");
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_type_generation_return)
+EFL_START_TEST(eolian_cxx_test_type_generation_return)
 {
   efl::eo::eo_init i;
 
@@ -129,9 +129,9 @@ START_TEST(eolian_cxx_test_type_generation_return)
     ck_assert_str_eq(string.c_str(), "foobar");
   }
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_type_generation_optional)
+EFL_START_TEST(eolian_cxx_test_type_generation_optional)
 {
   efl::eo::eo_init init;
 
@@ -175,9 +175,9 @@ START_TEST(eolian_cxx_test_type_generation_optional)
   ck_assert(*k == 42);
   g.optionaloutintptrown(nullptr);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_type_callback)
+EFL_START_TEST(eolian_cxx_test_type_callback)
 {
   efl::eo::eo_init i;
 
@@ -221,7 +221,7 @@ START_TEST(eolian_cxx_test_type_callback)
   ck_assert(event4);
   ck_assert(event5);
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_binding(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc b/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
index dcd88ac151..aff6deb36c 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_cyclic.cc
@@ -16,10 +16,10 @@ typedef Eo Cyclic2;
 
 #include "eolian_cxx_suite.h"
 
-START_TEST(eolian_cxx_test_cyclic_call)
+EFL_START_TEST(eolian_cxx_test_cyclic_call)
 {
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_cyclic(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
index 8acca1001c..3ebdec86bf 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_documentation.cc
@@ -33,7 +33,7 @@ klass_def init_test_data(efl::eolian::eolian_state const& state)
    return klass;
 }
 
-START_TEST(eolian_cxx_test_class_docs)
+EFL_START_TEST(eolian_cxx_test_class_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -57,9 +57,9 @@ START_TEST(eolian_cxx_test_class_docs)
            "@Docs");
    ck_assert_str_eq(doc.since.c_str(), "1.17");
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_function_docs)
+EFL_START_TEST(eolian_cxx_test_function_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -105,9 +105,9 @@ START_TEST(eolian_cxx_test_function_docs)
    ck_assert_str_eq(doc.description.c_str(), "");
    ck_assert_str_eq(doc.since.c_str(), "1.17");
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_property_docs)
+EFL_START_TEST(eolian_cxx_test_property_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -145,9 +145,9 @@ START_TEST(eolian_cxx_test_property_docs)
    ck_assert_str_eq(doc.description.c_str(), "");
    ck_assert_str_eq(doc.since.c_str(), "1.17"); // Members inherit from parent *class*
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_event_docs)
+EFL_START_TEST(eolian_cxx_test_event_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -161,9 +161,9 @@ START_TEST(eolian_cxx_test_event_docs)
    ck_assert_str_eq(doc.description.c_str(), "");
    ck_assert_str_eq(doc.since.c_str(), "1.17"); // Members inherit from parent *class*
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_enum_docs)
+EFL_START_TEST(eolian_cxx_test_enum_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -204,9 +204,9 @@ START_TEST(eolian_cxx_test_enum_docs)
    ck_assert_str_eq(doc.description.c_str(), "");
    ck_assert_str_eq(doc.since.c_str(), "");
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_struct_docs)
+EFL_START_TEST(eolian_cxx_test_struct_docs)
 {
    efl::eina::eina_init eina_init;
    efl::eolian::eolian_init eolian_init;
@@ -274,7 +274,7 @@ START_TEST(eolian_cxx_test_struct_docs)
    ck_assert_str_eq(doc.description.c_str(), "");
    ck_assert_str_eq(doc.since.c_str(), "");
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_documentation(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_generate.cc b/src/tests/eolian_cxx/eolian_cxx_test_generate.cc
index a6f0f110d3..d93c77d16f 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_generate.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_generate.cc
@@ -10,7 +10,7 @@
 
 #include <grammar/header.hpp>
 
-START_TEST(eolian_cxx_test_generate_complex_types)
+EFL_START_TEST(eolian_cxx_test_generate_complex_types)
 {
    using efl::eolian::grammar::class_header;
    using efl::eolian::grammar::attributes::unused_type;
@@ -66,7 +66,7 @@ START_TEST(eolian_cxx_test_generate_complex_types)
    // ck_assert(buffer.size() == (sizeof(result) - 1));
    // ck_assert(std::equal(buffer.begin(), buffer.end(), result));
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_generate(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_parse.cc b/src/tests/eolian_cxx/eolian_cxx_test_parse.cc
index 6618bc95dc..5462d4ef78 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_parse.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_parse.cc
@@ -9,23 +9,23 @@
 
 #include "eolian_cxx_suite.h"
 
-START_TEST(eolian_cxx_test_parse_complex_types)
+EFL_START_TEST(eolian_cxx_test_parse_complex_types)
 {
    efl::eolian::eolian_init init;
    // fail_if(!::eolian_state_directory_add(PACKAGE_DATA_DIR"/data"));
    // fail_if(!::eolian_state_file_parse(PACKAGE_DATA_DIR"/data/complex_type.eo"));
    // TODO finish
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(eolian_cxx_test_parse_qualifiers)
+EFL_START_TEST(eolian_cxx_test_parse_qualifiers)
 {
    efl::eolian::eolian_init init;
    // XXX: implement
    //eolian_cxx::type_qualify("");
    //fail_if();
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_parse(TCase* tc)
diff --git a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
index 971bb77886..0c2856f33a 100644
--- a/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
+++ b/src/tests/eolian_cxx/eolian_cxx_test_wrapper.cc
@@ -9,7 +9,7 @@
 
 #include "eolian_cxx_suite.h"
 
-START_TEST(eolian_cxx_test_wrapper_size)
+EFL_START_TEST(eolian_cxx_test_wrapper_size)
 {
   efl::eo::eo_init init;
 
@@ -19,7 +19,7 @@ START_TEST(eolian_cxx_test_wrapper_size)
   fail_if(sizeof(b) != sizeof(Eo*));
   fail_if(sizeof(b) != sizeof(c));
 }
-END_TEST
+EFL_END_TEST
 
 void
 eolian_cxx_test_wrapper(TCase* tc)