diff --git a/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java b/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java
index 770fb354bb..928d35af85 100644
--- a/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java
+++ b/dynamometer-infra/src/main/java/com/linkedin/dynamometer/Client.java
@@ -335,12 +335,12 @@ private void printUsage() {
    */
   public boolean init(String[] args) throws ParseException, IOException {
 
-    CommandLineParser parser = new GnuParser();
-    if (parser.parse(new Options().addOption("h", "help", false, "Shows this message."), args, true).hasOption("h")) {
+    if (Arrays.stream(args).anyMatch(arg -> arg.equalsIgnoreCase("-h") || arg.equals("--help"))) {
       printUsage();
       return false;
     }
 
+    CommandLineParser parser = new GnuParser();
     CommandLine cliParser = parser.parse(opts, args);
 
     yarnClient = YarnClient.createYarnClient();