diff --git a/src/lib/log.js b/src/lib/log.js
index 664ea3b14..ea3e916d2 100644
--- a/src/lib/log.js
+++ b/src/lib/log.js
@@ -57,7 +57,7 @@ Log.loggers = require('./loggers');
 Log.prototype.close = function () {
   this.emit('closing');
   if (this.listenerCount()) {
-    console.error('Something is still listening for log events, but the logger is closing.');
+    console.error('Something is still listening for log events, but the logger is closing.'); // eslint-disable-line no-console
     this.clearAllListeners();
   }
 };
diff --git a/test/.eslintrc b/test/.eslintrc
new file mode 100644
index 000000000..8e7cc14b9
--- /dev/null
+++ b/test/.eslintrc
@@ -0,0 +1,4 @@
+---
+extends: ../.eslintrc
+env:
+  mocha: true
diff --git a/test/unit/specs/client.js b/test/unit/specs/client.js
index 7bbe6a78e..4d7c59275 100644
--- a/test/unit/specs/client.js
+++ b/test/unit/specs/client.js
@@ -1,59 +1,85 @@
 describe('Client instances creation', function () {
-  var path = require('path');
+  var stream = require('stream');
+  var util = require('util');
+
   var es = require('../../../src/elasticsearch');
   var apis = require('../../../src/lib/apis');
   var expect = require('expect.js');
   var stub = require('../../utils/auto_release_stub').make();
   var client;
 
-  beforeEach(function () {
-    client = new es.Client();
-  });
-
-  afterEach(function () {
-    client.close();
-  });
-
-  it('throws an error linking to the es module when you try to instanciate the exports', function () {
-    var Es = es;
-    expect(function () {
-      var c = new Es();
-    }).to.throwError(/previous "elasticsearch" module/);
-  });
-
-  var pkg = require('../../../package.json');
-  var def = pkg.config.default_api_branch;
-  var prev = pkg.config.supported_es_branches[pkg.config.supported_es_branches.indexOf(def) + 1];
-
-  it('inherits the ' + def + ' API by default', function () {
-    expect(client.bulk).to.be(apis[def].bulk);
-    expect(client.nodes.stats).to.be(apis[def].nodes.prototype.stats);
-  });
-
-  it('inherits the ' + prev + ' API when specified', function () {
-    client.close();
-    client = es.Client({
-      apiVersion: prev
+  describe('', function () {
+    beforeEach(function () {
+      client = new es.Client();
+    });
+
+    afterEach(function () {
+      client.close();
+    });
+
+    it('throws an error linking to the es module when you try to instanciate the exports', function () {
+      var Es = es;
+      expect(function () {
+        var c = new Es();
+        return c
+      }).to.throwError(/previous "elasticsearch" module/);
+    });
+
+    var pkg = require('../../../package.json');
+    var def = pkg.config.default_api_branch;
+    var prev = pkg.config.supported_es_branches[pkg.config.supported_es_branches.indexOf(def) + 1];
+
+    it('inherits the ' + def + ' API by default', function () {
+      expect(client.bulk).to.be(apis[def].bulk);
+      expect(client.nodes.stats).to.be(apis[def].nodes.prototype.stats);
+    });
+
+    it('inherits the ' + prev + ' API when specified', function () {
+      client.close();
+      client = es.Client({
+        apiVersion: prev
+      });
+      expect(client.bulk).to.be(apis[prev].bulk);
+      expect(client.cluster.nodeStats).to.be(apis[prev].cluster.prototype.nodeStats);
+    });
+
+    it('closing the client causes it\'s transport to be closed', function () {
+      var called = false;
+      client.transport.close = function () {
+        called = true;
+      };
+      client.close();
+      expect(called).to.be(true);
+    });
+
+    it('creates a warning level logger by default', function () {
+      expect(client.transport.log.listenerCount('error')).to.eql(1);
+      expect(client.transport.log.listenerCount('warning')).to.eql(1);
+      expect(client.transport.log.listenerCount('info')).to.eql(0);
+      expect(client.transport.log.listenerCount('debug')).to.eql(0);
+      expect(client.transport.log.listenerCount('trace')).to.eql(0);
     });
-    expect(client.bulk).to.be(apis[prev].bulk);
-    expect(client.cluster.nodeStats).to.be(apis[prev].cluster.prototype.nodeStats);
   });
 
-  it('closing the client causes it\'s transport to be closed', function () {
-    var called = false;
-    client.transport.close = function () {
-      called = true;
-    };
-    client.close();
-    expect(called).to.be(true);
-  });
+  describe('config', function () {
+    it('accepts a stream type logger', function (done) {
+      function NullStream() {
+        stream.Writable.call(this);
+      }
+      util.inherits(NullStream, stream.Writable);
 
-  it('creates a warning level logger by default', function () {
-    expect(client.transport.log.listenerCount('error')).to.eql(1);
-    expect(client.transport.log.listenerCount('warning')).to.eql(1);
-    expect(client.transport.log.listenerCount('info')).to.eql(0);
-    expect(client.transport.log.listenerCount('debug')).to.eql(0);
-    expect(client.transport.log.listenerCount('trace')).to.eql(0);
+      NullStream.prototype._write = function(/* chunk, encoding, next */) {
+        done();
+      };
+
+      var client = new es.Client({
+        log: [
+          { type: 'stream', stream: new NullStream() }
+        ]
+      });
+
+      client.transport.log.error(new Error());
+    });
   });
 
   describe('#ping', function () {