diff --git a/src/tests/efl_check.h b/src/tests/efl_check.h
index 2272115019..a7d39b6bd7 100644
--- a/src/tests/efl_check.h
+++ b/src/tests/efl_check.h
@@ -4,6 +4,8 @@
 #include <stdlib.h> /* getenv */
 #include <stdio.h> /* fprintf, fputs */
 #include <string.h> /* strcmp */
+#include <unistd.h> /* execvp */
+#include <errno.h> /* errno */
 
 typedef struct _Efl_Test_Case Efl_Test_Case;
 struct _Efl_Test_Case
@@ -34,6 +36,7 @@ _efl_test_option_disp(int argc, char **argv, const Efl_Test_Case *etc)
              fprintf(stderr, "Usage: %s [options] [test_case1 .. [test_caseN]]\n",
                      argv[0]);
              fprintf(stderr, " -l\t--list\t\tList all tests case.\n");
+             fprintf(stderr, " \t--valgrind\tRun the tests under valgrind.\n");
              fprintf(stderr, "\nNote that CK_RUN_CASE=test_case does also filter which tests are run\n");
              return 0;
           }
@@ -43,6 +46,24 @@ _efl_test_option_disp(int argc, char **argv, const Efl_Test_Case *etc)
              _efl_tests_list(etc);
              return 0;
           }
+        else if (strcmp(argv[i], "--valgrind") == 0)
+          {
+             const char *nav[argc + 3];
+             int j, k;
+
+             nav[0] = "valgrind";
+             nav[1] = "--trace-children=yes";
+             for (j = 0, k = 2; j < argc; j++)
+               {
+                  if (i == j) continue ; // Remove --valgrind
+                  nav[k++] = argv[j];
+               }
+
+             nav[k] = NULL;
+             execvp("valgrind", (char**) nav);
+             fprintf(stderr, "Failed to execute valgrind due to '%s'\n", strerror(errno));
+             return 0;
+          }
      }
 
    return 1;