diff --git a/configure.ac b/configure.ac
index b94f60d8e7..57c267a029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,6 +223,7 @@ esac
 AC_SUBST([MODULE_ARCH])
 AC_DEFINE_UNQUOTED([MODULE_ARCH], ["${MODULE_ARCH}"], ["Module architecture"])
 AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["${MODULE_EXT}"], [Suffix for shared objects])
+AC_DEFINE_UNQUOTED([EXEEXT], ["${EXEEXT}"], [Suffix for binary objects])
 
 # TODO: move me to m4 file that setups the windows related variables
 AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"])
diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index f3ccc71a6e..40ddb74567 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -72,15 +72,9 @@ _eolian_gen_execute(const char *eo_filename, const char *options, const char *ou
 
    if (getenv("EFL_RUN_IN_TREE"))
      {
-#ifdef _WIN32
         snprintf(eolian_gen_path, sizeof(eolian_gen_path),
-              "%s/src/bin/eolian/eolian_gen.exe",
-              PACKAGE_BUILD_DIR);
-#else
-        snprintf(eolian_gen_path, sizeof(eolian_gen_path),
-              "%s/src/bin/eolian/eolian_gen",
-              PACKAGE_BUILD_DIR);
-#endif
+              "%s/src/bin/eolian/eolian_gen%s",
+              PACKAGE_BUILD_DIR, EXEEXT);
      }
    if (eolian_gen_path[0] == '\0')
       return -1;