diff --git a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java
index d8806554c..24c0d28de 100644
--- a/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java
+++ b/kubernetes-client/src/test/java/io/fabric8/kubernetes/client/ConfigTest.java
@@ -503,6 +503,8 @@ public class ConfigTest {
   void honorClientAuthenticatorCommands() throws Exception {
     switch (FileSystem.getCurrent()) {
       case WINDOWS:
+        // nocommit...
+        fail("Windows config and token-generator need updated to run this (modified) test on windows");
         System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_WIN_FILE);
         break;
       default:
@@ -512,7 +514,24 @@ public class ConfigTest {
 
     Config config = Config.autoConfigure(null);
     assertNotNull(config);
-    assertEquals("HELLO WORLD", config.getOauthToken());
+    assertEquals("[WE SAY] [HELLO] [WORLD]", config.getOauthToken());
+  }
+  
+  @Test
+  void honorClientAuthenticatorCommandsNullArgs() throws Exception {
+    switch (FileSystem.getCurrent()) {
+      case WINDOWS:
+        // nocommit...
+        fail("Windows config and token-generator need updated to run this test on windows");
+        break;
+      default:
+        Files.setPosixFilePermissions(Paths.get(TEST_TOKEN_GENERATOR_FILE), PosixFilePermissions.fromString("rwxrwxr-x"));
+        System.setProperty(Config.KUBERNETES_KUBECONFIG_FILE, TEST_KUBECONFIG_EXEC_FILE);
+    }
+
+    Config config = Config.autoConfigure("null-exec-args");
+    assertNotNull(config);
+    assertEquals("[] [HELLO] []", config.getOauthToken());
   }
 
   @Test
diff --git a/kubernetes-client/src/test/resources/test-kubeconfig-exec b/kubernetes-client/src/test/resources/test-kubeconfig-exec
index e977565b6..b22487bb3 100644
--- a/kubernetes-client/src/test/resources/test-kubeconfig-exec
+++ b/kubernetes-client/src/test/resources/test-kubeconfig-exec
@@ -9,6 +9,10 @@ contexts:
     cluster: test
     user: test
   name: test
+- context:
+    cluster: test
+    user: null-exec-args
+  name: null-exec-args
 current-context: test
 users:
 - name: test
@@ -17,6 +21,16 @@ users:
       apiVersion: client.authentication.k8s.io/v1alpha1
       args:
       - world
+      - "We Say"
+      command: ./token-generator
+      env:
+      - name: PART1
+        value: hello
+- name: null-exec-args
+  user:
+    exec:
+      apiVersion: client.authentication.k8s.io/v1alpha1
+      args: null
       command: ./token-generator
       env:
       - name: PART1
diff --git a/kubernetes-client/src/test/resources/token-generator b/kubernetes-client/src/test/resources/token-generator
index 43b0fb90e..d9052b8fd 100644
--- a/kubernetes-client/src/test/resources/token-generator
+++ b/kubernetes-client/src/test/resources/token-generator
@@ -1,5 +1,5 @@
 #!/bin/sh
-token=`echo $PART1 $1 | tr '[a-z]' '[A-Z]'`
+token=`echo "[$2] [$PART1] [$1]" | tr '[a-z]' '[A-Z]'`
 cat <<EOF
 {
   "kind": "ExecCredential",