diff --git a/.eslintrc b/.eslintrc
index cc09afbc..674234d4 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -2,6 +2,7 @@
     "root": true,
     "rules": {
         "indent": ["error", 4],
+        "key-spacing": "error",
         "semi": ["error", "always"],
         "space-before-function-paren": ["error", {
             "anonymous": "always",
diff --git a/lib/test.js b/lib/test.js
index de302c33..7f8c3d81 100644
--- a/lib/test.js
+++ b/lib/test.js
@@ -169,8 +169,8 @@ Test.prototype._end = function (err) {
     if (!this._planError && this._plan !== undefined && pendingAsserts) {
         this._planError = true;
         this.fail('plan != count', {
-            expected : this._plan,
-            actual : this.assertCount
+            expected: this._plan,
+            actual: this.assertCount
         });
     }
     this.ended = true;
@@ -181,9 +181,9 @@ Test.prototype._exit = function () {
         !this._planError && this.assertCount !== this._plan) {
         this._planError = true;
         this.fail('plan != count', {
-            expected : this._plan,
-            actual : this.assertCount,
-            exiting : true
+            expected: this._plan,
+            actual: this.assertCount,
+            exiting: true
         });
     } else if (!this.ended) {
         this.fail('test exited without ending', {
@@ -310,44 +310,44 @@ Test.prototype._assert = function assert(ok, opts) {
     if (!self._planError && pendingAsserts < 0) {
         self._planError = true;
         self.fail('plan != count', {
-            expected : self._plan,
-            actual : self._plan - pendingAsserts
+            expected: self._plan,
+            actual: self._plan - pendingAsserts
         });
     }
 };
 
 Test.prototype.fail = function (msg, extra) {
     this._assert(false, {
-        message : msg,
-        operator : 'fail',
-        extra : extra
+        message: msg,
+        operator: 'fail',
+        extra: extra
     });
 };
 
 Test.prototype.pass = function (msg, extra) {
     this._assert(true, {
-        message : msg,
-        operator : 'pass',
-        extra : extra
+        message: msg,
+        operator: 'pass',
+        extra: extra
     });
 };
 
 Test.prototype.skip = function (msg, extra) {
     this._assert(true, {
-        message : msg,
-        operator : 'skip',
-        skip : true,
-        extra : extra
+        message: msg,
+        operator: 'skip',
+        skip: true,
+        extra: extra
     });
 };
 
 function assert(value, msg, extra) {
     this._assert(value, {
-        message : defined(msg, 'should be truthy'),
-        operator : 'ok',
-        expected : true,
-        actual : value,
-        extra : extra
+        message: defined(msg, 'should be truthy'),
+        operator: 'ok',
+        expected: true,
+        actual: value,
+        extra: extra
     });
 }
 Test.prototype.ok
@@ -357,11 +357,11 @@ Test.prototype.ok
 
 function notOK(value, msg, extra) {
     this._assert(!value, {
-        message : defined(msg, 'should be falsy'),
-        operator : 'notOk',
-        expected : false,
-        actual : value,
-        extra : extra
+        message: defined(msg, 'should be falsy'),
+        operator: 'notOk',
+        expected: false,
+        actual: value,
+        extra: extra
     });
 }
 Test.prototype.notOk
@@ -371,10 +371,10 @@ Test.prototype.notOk
 
 function error(err, msg, extra) {
     this._assert(!err, {
-        message : defined(msg, String(err)),
-        operator : 'error',
-        actual : err,
-        extra : extra
+        message: defined(msg, String(err)),
+        operator: 'error',
+        actual: err,
+        extra: extra
     });
 }
 Test.prototype.error
@@ -385,11 +385,11 @@ Test.prototype.error
 
 function equal(a, b, msg, extra) {
     this._assert(a === b, {
-        message : defined(msg, 'should be equal'),
-        operator : 'equal',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should be equal'),
+        operator: 'equal',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.equal
@@ -402,11 +402,11 @@ Test.prototype.equal
 
 function notEqual(a, b, msg, extra) {
     this._assert(a !== b, {
-        message : defined(msg, 'should not be equal'),
-        operator : 'notEqual',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should not be equal'),
+        operator: 'notEqual',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.notEqual
@@ -422,11 +422,11 @@ Test.prototype.notEqual
 
 function tapeDeepEqual(a, b, msg, extra) {
     this._assert(deepEqual(a, b, { strict: true }), {
-        message : defined(msg, 'should be equivalent'),
-        operator : 'deepEqual',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should be equivalent'),
+        operator: 'deepEqual',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.deepEqual
@@ -437,11 +437,11 @@ Test.prototype.deepEqual
 
 function deepLooseEqual(a, b, msg, extra) {
     this._assert(deepEqual(a, b), {
-        message : defined(msg, 'should be equivalent'),
-        operator : 'deepLooseEqual',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should be equivalent'),
+        operator: 'deepLooseEqual',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.deepLooseEqual
@@ -451,11 +451,11 @@ Test.prototype.deepLooseEqual
 
 function notDeepEqual(a, b, msg, extra) {
     this._assert(!deepEqual(a, b, { strict: true }), {
-        message : defined(msg, 'should not be equivalent'),
-        operator : 'notDeepEqual',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should not be equivalent'),
+        operator: 'notDeepEqual',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.notDeepEqual
@@ -471,11 +471,11 @@ Test.prototype.notDeepEqual
 
 function notDeepLooseEqual(a, b, msg, extra) {
     this._assert(!deepEqual(a, b), {
-        message : defined(msg, 'should be equivalent'),
-        operator : 'notDeepLooseEqual',
-        actual : a,
-        expected : b,
-        extra : extra
+        message: defined(msg, 'should be equivalent'),
+        operator: 'notDeepLooseEqual',
+        actual: a,
+        expected: b,
+        extra: extra
     });
 }
 Test.prototype.notDeepLooseEqual
@@ -494,7 +494,7 @@ Test.prototype['throws'] = function (fn, expected, msg, extra) {
     try {
         fn();
     } catch (err) {
-        caught = { error : err };
+        caught = { error: err };
         if ((err != null) && (!isEnumerable(err, 'message') || !has(err, 'message'))) {
             var message = err.message;
             delete err.message;
@@ -514,12 +514,12 @@ Test.prototype['throws'] = function (fn, expected, msg, extra) {
     }
 
     this._assert(typeof fn === 'function' && passed, {
-        message : defined(msg, 'should throw'),
-        operator : 'throws',
-        actual : caught && caught.error,
-        expected : expected,
+        message: defined(msg, 'should throw'),
+        operator: 'throws',
+        actual: caught && caught.error,
+        expected: expected,
         error: !passed && caught && caught.error,
-        extra : extra
+        extra: extra
     });
 };
 
@@ -533,15 +533,15 @@ Test.prototype.doesNotThrow = function (fn, expected, msg, extra) {
         fn();
     }
     catch (err) {
-        caught = { error : err };
+        caught = { error: err };
     }
     this._assert(!caught, {
-        message : defined(msg, 'should not throw'),
-        operator : 'throws',
-        actual : caught && caught.error,
-        expected : expected,
-        error : caught && caught.error,
-        extra : extra
+        message: defined(msg, 'should not throw'),
+        operator: 'throws',
+        actual: caught && caught.error,
+        expected: expected,
+        error: caught && caught.error,
+        extra: extra
     });
 };
 
diff --git a/test/circular-things.js b/test/circular-things.js
index 88a8465b..98e57a38 100644
--- a/test/circular-things.js
+++ b/test/circular-things.js
@@ -5,7 +5,7 @@ var concat = require('concat-stream');
 var stripFullStack = require('./common').stripFullStack;
 
 tap.test('circular test', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     assert.plan(1);
 
     test.createStream().pipe(concat(function (body) {
diff --git a/test/deep-equal-failure.js b/test/deep-equal-failure.js
index c6fa3f64..6bf91d8d 100644
--- a/test/deep-equal-failure.js
+++ b/test/deep-equal-failure.js
@@ -8,7 +8,7 @@ var getDiag = common.getDiag;
 var stripFullStack = common.stripFullStack;
 
 tap.test('deep equal failure', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
@@ -69,7 +69,7 @@ tap.test('deep equal failure', function (assert) {
 });
 
 tap.test('deep equal failure, depth 6, with option', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
@@ -130,7 +130,7 @@ tap.test('deep equal failure, depth 6, with option', function (assert) {
 });
 
 tap.test('deep equal failure, depth 6, without option', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
diff --git a/test/fail.js b/test/fail.js
index b1123c2c..96769341 100644
--- a/test/fail.js
+++ b/test/fail.js
@@ -8,7 +8,7 @@ var stripFullStack = require('./common').stripFullStack;
 tap.test('array test', function (tt) {
     tt.plan(1);
 
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var tc = function (rows) {
         tt.same(stripFullStack(rows.toString('utf8')), [
             'TAP version 13',
diff --git a/test/has spaces.js b/test/has spaces.js
index 19a2b9e3..f8630de3 100644
--- a/test/has spaces.js	
+++ b/test/has spaces.js	
@@ -7,7 +7,7 @@ var stripFullStack = require('./common').stripFullStack;
 tap.test('array test', function (tt) {
     tt.plan(1);
 
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var tc = function (rows) {
         tt.same(stripFullStack(rows.toString('utf8')), [
             'TAP version 13',
diff --git a/test/max_listeners.js b/test/max_listeners.js
index e807cdbf..23ebea8c 100644
--- a/test/max_listeners.js
+++ b/test/max_listeners.js
@@ -3,7 +3,7 @@ var path = require('path');
 
 var ps = spawn(process.execPath, [path.join(__dirname, 'max_listeners', 'source.js')]);
 
-ps.stdout.pipe(process.stdout, { end : false });
+ps.stdout.pipe(process.stdout, { end: false });
 
 ps.stderr.on('data', function (buf) {
     console.log('not ok ' + buf);
diff --git a/test/not-deep-equal-failure.js b/test/not-deep-equal-failure.js
index 305029ca..166f7e02 100644
--- a/test/not-deep-equal-failure.js
+++ b/test/not-deep-equal-failure.js
@@ -8,7 +8,7 @@ var getDiag = common.getDiag;
 var stripFullStack = common.stripFullStack;
 
 tap.test('deep equal failure', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
@@ -69,7 +69,7 @@ tap.test('deep equal failure', function (assert) {
 });
 
 tap.test('not deep equal failure, depth 6, with option', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
@@ -130,7 +130,7 @@ tap.test('not deep equal failure, depth 6, with option', function (assert) {
 });
 
 tap.test('not deep equal failure, depth 6, without option', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
diff --git a/test/not-equal-failure.js b/test/not-equal-failure.js
index d007b37d..83fc0a4e 100644
--- a/test/not-equal-failure.js
+++ b/test/not-equal-failure.js
@@ -8,7 +8,7 @@ var getDiag = common.getDiag;
 var stripFullStack = common.stripFullStack;
 
 tap.test('not equal failure', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var stream = test.createStream();
     var parser = tapParser();
     assert.plan(3);
diff --git a/test/onFailure.js b/test/onFailure.js
index 518c3732..ec5d9345 100644
--- a/test/onFailure.js
+++ b/test/onFailure.js
@@ -4,7 +4,7 @@ var tape = require("../").createHarness();
 //Because this test passing depends on a failure,
 //we must direct the failing output of the inner test
 var noop = function () {};
-var mockSink = {on:noop, removeListener:noop, emit:noop, end:noop};
+var mockSink = {on: noop, removeListener: noop, emit: noop, end: noop};
 tape.createStream().pipe(mockSink);
 
 tap.test("on failure", { timeout: 1000 }, function (tt) {
diff --git a/test/only-twice.js b/test/only-twice.js
index 50eea1ec..47c97f5f 100644
--- a/test/only-twice.js
+++ b/test/only-twice.js
@@ -2,7 +2,7 @@ var tape = require('../');
 var tap = require('tap');
 
 tap.test('only twice error', function (assert) {
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
 
     test.only("first only", function (t) {
         t.end();
diff --git a/test/too_many.js b/test/too_many.js
index c62cb4c3..a3a780a2 100644
--- a/test/too_many.js
+++ b/test/too_many.js
@@ -8,7 +8,7 @@ var stripFullStack = require('./common').stripFullStack;
 tap.test('array test', function (tt) {
     tt.plan(1);
 
-    var test = tape.createHarness({ exit : false });
+    var test = tape.createHarness({ exit: false });
     var tc = function (rows) {
         tt.same(stripFullStack(rows.toString('utf8')), [
             'TAP version 13',