diff --git a/test/test-automation/src/runner/runner.c b/test/test-automation/src/runner/runner.c
index 42bcfb86b..967be5327 100644
--- a/test/test-automation/src/runner/runner.c
+++ b/test/test-automation/src/runner/runner.c
@@ -1209,7 +1209,15 @@ ParseOptions(int argc, char *argv[])
 
     	  // \todo User given string should be handled as a string
     	  // representing a hex digit
-    	  userExecKey = atoi(execKeyString);
+    	  //userExecKey = atoi(execKeyString);
+
+    	  int ret = sscanf(execKeyString, "%llx", &userExecKey);
+    	  if(ret != 1) {
+    		  fprintf(stderr, "Error: Failed to parse exec-key option");
+    		  exit(1);
+    	  }
+
+    	  printf("%Lx", userExecKey);
       }
       else if(SDL_strcmp(arg, "--test") == 0 || SDL_strcmp(arg, "-t") == 0) {
     	  only_selected_test = 1;