diff --git a/src/bin/exactness/injector.c b/src/bin/exactness/injector.c
index d98c478bde..2eb82d7bfe 100644
--- a/src/bin/exactness/injector.c
+++ b/src/bin/exactness/injector.c
@@ -464,8 +464,8 @@ int main(int argc, char **argv)
    real__ = efl_loop_exit_code_process(ret__);
    elm_shutdown();
 end:
+   ecore_shutdown();
    eet_shutdown();
    eina_shutdown();
    return real__;
 }
-
diff --git a/src/bin/exactness/player.c b/src/bin/exactness/player.c
index dcffb0e2df..e338c0cba8 100644
--- a/src/bin/exactness/player.c
+++ b/src/bin/exactness/player.c
@@ -1333,7 +1333,7 @@ int main(int argc, char **argv)
         if (!f_output)
           {
              fprintf(stderr, "no program specified\nUse -h for more information\n");
-             goto end;
+             goto cleanup;
           }
         argv[0] = strdup(f_output);
      }
@@ -1357,7 +1357,12 @@ int main(int argc, char **argv)
         exactness_unit_file_write(_dest_unit, _dest);
      }
 
+cleanup:
+   evas_shutdown();
+   efl_object_shutdown();
+
 end:
+   ecore_shutdown();
    eet_shutdown();
    eina_shutdown();
    return pret;
diff --git a/src/bin/exactness/recorder.c b/src/bin/exactness/recorder.c
index f3fd80148f..895d3f88f2 100644
--- a/src/bin/exactness/recorder.c
+++ b/src/bin/exactness/recorder.c
@@ -467,7 +467,7 @@ int main(int argc, char **argv)
         if (!ecore_file_exists(fonts_dir))
           {
              fprintf(stderr, "Unable to find fonts directory %s\n", fonts_dir);
-             goto end;
+             goto cleanup;
           }
         Eina_List *dated_fonts = ecore_file_ls(fonts_dir);
         char *date_dir;
@@ -516,7 +516,12 @@ int main(int argc, char **argv)
    //_events_list = NULL;
 
    pret = 0;
+
+cleanup:
+   efl_object_shutdown();
+   evas_shutdown();
 end:
+   ecore_shutdown();
    eina_shutdown();
    return pret;
 }