diff --git a/src/bin/main.c b/src/bin/main.c
index 0f90ee7..3a3525e 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,6 +9,7 @@ const char *profile = "n800";
 const char *choosen_engine = NULL;
 int win_w = 720, win_h = 420;
 int loops = LOOPS;
+int one_test = 0;
 Eina_Bool fullscreen = EINA_FALSE;
 Eina_Bool cmp_report = EINA_FALSE;
 
@@ -1322,6 +1323,7 @@ main(int argc, char **argv)
      }
    else if (test > 0)
      {
+        one_test = 1;
         ui_num(test);
      }
 
diff --git a/src/bin/main.h b/src/bin/main.h
index 5a861eb..4f373b5 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -47,6 +47,7 @@ extern "C"
 extern Evas *evas;
 extern int   win_w, win_h;
 extern int   loops;
+extern int   one_test;
 extern const char *choosen_engine;
 extern Eina_Bool fullscreen;
 extern Eina_Bool cmp_report;
diff --git a/src/bin/ui.c b/src/bin/ui.c
index 26bad2b..9563ebe 100644
--- a/src/bin/ui.c
+++ b/src/bin/ui.c
@@ -514,6 +514,7 @@ ui_num(int n)
         if (!mi->test)
           return;
         menu_sel = n;
+        if (one_test) test_item = menu_sel;
         _ui_select();
      }
 }
@@ -724,7 +725,7 @@ ui_fps(double fps)
 
         test_item++;
         mi = eina_list_nth(menu, test_item);
-        if (!mi->test)
+        if (one_test || !mi->test)
           {
              char datestr[1024];
              struct tm *tim;