diff --git a/gateway-performance-test/src/main/java/org/apache/knox/gateway/performance/test/knoxtoken/KnoxTokenWorkerThread.java b/gateway-performance-test/src/main/java/org/apache/knox/gateway/performance/test/knoxtoken/KnoxTokenWorkerThread.java
index 893a200d02..9eb90321fe 100644
--- a/gateway-performance-test/src/main/java/org/apache/knox/gateway/performance/test/knoxtoken/KnoxTokenWorkerThread.java
+++ b/gateway-performance-test/src/main/java/org/apache/knox/gateway/performance/test/knoxtoken/KnoxTokenWorkerThread.java
@@ -128,12 +128,13 @@ private long calculateSleepTime(long lowerBound, long upperBound) {
   private String acquireKnoxToken(KnoxSession knoxSession) throws IOException {
     LOG.acquireKnoxToken();
     long getStart = System.currentTimeMillis();
-    final Get.Response getTokenResponse = Token.get(knoxSession).now();
-    final long getResponseTime = System.currentTimeMillis() - getStart;
-    LOG.acquiredKnoxToken();
-    responseTimeCache.saveAcquireResponseTime(getResponseTime);
-    final Map<String, String> tokenAsMap = JsonUtils.getMapFromJsonString(getTokenResponse.getString());
-    return tokenAsMap.get("access_token");
+    try (Get.Response getTokenResponse = Token.get(knoxSession).now()) {
+      final long getResponseTime = System.currentTimeMillis() - getStart;
+      LOG.acquiredKnoxToken();
+      responseTimeCache.saveAcquireResponseTime(getResponseTime);
+      final Map<String, String> tokenAsMap = JsonUtils.getMapFromJsonString(getTokenResponse.getString());
+      return tokenAsMap.get("access_token");
+    }
   }
 
   private void renewKnoxToken(KnoxSession knoxSession) throws Exception {
diff --git a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
index ec169b51d7..f327496869 100644
--- a/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
+++ b/gateway-shell/src/main/java/org/apache/knox/gateway/shell/KnoxSh.java
@@ -215,12 +215,8 @@ public void execute() throws Exception {
       String username = credentials.get("user").string();
       String pass = credentials.get("pass").string();
 
-      KnoxSession session = null;
-      Get.Response response;
-      try {
-        session = KnoxSession.login(gateway, username, pass);
-
-        response = Token.get( session ).now();
+      try (KnoxSession session = KnoxSession.login(gateway, username, pass);
+           Get.Response response = Token.get( session ).now()) {
         String text = response.getString();
         Map<String, String> json = JsonUtils.getMapFromJsonString(text);
 
@@ -248,9 +244,6 @@ public void execute() throws Exception {
           }
         System.out.println(message);
       }
-      if ( session != null ) {
-        session.shutdown();
-      }
     }
 
     @Override