diff --git a/.eslintrc.yaml b/.eslintrc.yaml
index 81d40e278..ed2e46d65 100644
--- a/.eslintrc.yaml
+++ b/.eslintrc.yaml
@@ -2,7 +2,6 @@
 extends: "@elastic/eslint-config-kibana"
 
 rules:
-  one-var: warn
   new-cap: warn
   space-unary-ops: warn
   dot-notation: warn
diff --git a/src/lib/client_action.js b/src/lib/client_action.js
index d54c1e3e8..20488ee04 100644
--- a/src/lib/client_action.js
+++ b/src/lib/client_action.js
@@ -183,7 +183,9 @@ const castType = {
 };
 
 function resolveUrl(url, params) {
-  let vars = {}, i, key;
+  const vars = {};
+  let i;
+  let key;
 
   if (url.req) {
     // url has required params
diff --git a/src/lib/connectors/http.js b/src/lib/connectors/http.js
index c8ea501c0..671206594 100644
--- a/src/lib/connectors/http.js
+++ b/src/lib/connectors/http.js
@@ -65,7 +65,8 @@ HttpConnector.prototype.onStatusSet = _.handler(function (status) {
     _.each(agent.sockets, collectSockets);
     _.each(agent.freeSockets, collectSockets);
     _.each(toRemove, function (args) {
-      let host = args[0], socket = args[1];
+      const host = args[0];
+      const socket = args[1];
       agent.removeSocket(socket, parseUrl(host));
       socket.destroy();
     });
diff --git a/src/lib/serializers/json.js b/src/lib/serializers/json.js
index 15d4cbcd8..0bc9b4a10 100755
--- a/src/lib/serializers/json.js
+++ b/src/lib/serializers/json.js
@@ -44,7 +44,8 @@ Json.prototype.deserialize = function (str) {
 };
 
 Json.prototype.bulkBody = function (val) {
-  let body = '', i;
+  let body = '';
+  let i;
 
   if (_.isArray(val)) {
     for (i = 0; i < val.length; i++) {
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 02ab41293..711dad613 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -97,7 +97,10 @@ function adjustWordCase(firstWordCap, otherWordsCap, sep) {
     let i = 0;
     const words = [];
     let word = '';
-    let code, c, upper, lower;
+    let code;
+    let c;
+    let upper;
+    let lower;
 
     for (; i < string.length; i++) {
       code = string.charCodeAt(i);
diff --git a/test/unit/specs/connection_pool.js b/test/unit/specs/connection_pool.js
index fe8e6f4f9..7e815e68f 100644
--- a/test/unit/specs/connection_pool.js
+++ b/test/unit/specs/connection_pool.js
@@ -19,7 +19,11 @@ function listenerCount(emitter, event) {
 
 describe('Connection Pool', function () {
   describe('Adding/Removing/Syncing Connections', function () {
-    let pool, host, connection, host2, connection2;
+    let pool;
+    let host;
+    let connection;
+    let host2;
+    let connection2;
 
     beforeEach(function () {
       pool = new ConnectionPool({});
@@ -93,7 +97,9 @@ describe('Connection Pool', function () {
   });
 
   describe('Connection selection', function () {
-    let pool, host, host2;
+    let pool;
+    let host;
+    let host2;
 
     beforeEach(function () {
       pool = new ConnectionPool({});
@@ -211,7 +217,11 @@ describe('Connection Pool', function () {
   });
 
   describe('Connection state management', function () {
-    let pool, host, host2, connection, connection2;
+    let pool;
+    let host;
+    let host2;
+    let connection;
+    let connection2;
 
     beforeEach(function () {
       pool = new ConnectionPool({});
diff --git a/test/unit/specs/log.js b/test/unit/specs/log.js
index 17410da15..2acd67f24 100644
--- a/test/unit/specs/log.js
+++ b/test/unit/specs/log.js
@@ -128,7 +128,8 @@ describe('Log class', function () {
   });
 
   describe('instance without one output listening to all events', function () {
-    let log, call;
+    let log;
+    let call;
     beforeEach(function () {
       call = void 0;
       log = new Log({
diff --git a/test/unit/specs/transport.js b/test/unit/specs/transport.js
index 5ceeaa43f..905d2cc1b 100644
--- a/test/unit/specs/transport.js
+++ b/test/unit/specs/transport.js
@@ -817,7 +817,8 @@ describe('Transport Class', function () {
       ]);
 
       sinon.assert.calledOnce(trans.connectionPool.setHosts);
-      let host, hosts = trans.connectionPool.setHosts.firstCall.args[0];
+      let host;
+      const hosts = trans.connectionPool.setHosts.firstCall.args[0];
 
       expect(hosts).to.have.length(3);