diff --git a/tests/array-bracket-even-spacing.js b/tests/array-bracket-even-spacing.js
index 6e3fef6..f71d5c9 100644
--- a/tests/array-bracket-even-spacing.js
+++ b/tests/array-bracket-even-spacing.js
@@ -9,16 +9,16 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-var eslint = require('eslint')
-var ESLintTester = require('eslint-tester')
+var RuleTester = require('eslint').RuleTester
+var rule = require('../rules/array-bracket-even-spacing')
 var ecma = { destructuring: true, modules: true }
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint.linter)
-eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
+var ruleTester = new RuleTester()
+ruleTester.run('array-bracket-even-spacing', rule, {
   valid: [
 
     // either
@@ -174,7 +174,7 @@ eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ArrayPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
 
@@ -188,7 +188,7 @@ eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ArrayPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
 
@@ -202,7 +202,7 @@ eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ArrayPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
     },
@@ -215,7 +215,7 @@ eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ArrayExpression',
           line: 1,
-          column: 8
+          column: 9
         }
       ]
     },
@@ -228,7 +228,7 @@ eslintTester.addRuleTest('rules/array-bracket-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ArrayExpression',
           line: 1,
-          column: 8
+          column: 9
         }
       ]
     },
diff --git a/tests/computed-property-even-spacing.js b/tests/computed-property-even-spacing.js
index 556aa52..3a84b55 100644
--- a/tests/computed-property-even-spacing.js
+++ b/tests/computed-property-even-spacing.js
@@ -9,15 +9,15 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-var eslint = require('eslint')
-var ESLintTester = require('eslint-tester')
+var RuleTester = require('eslint').RuleTester
+var rule = require('../rules/computed-property-even-spacing')
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint.linter)
-eslintTester.addRuleTest('rules/computed-property-even-spacing', {
+var ruleTester = new RuleTester()
+ruleTester.run('computed-property-even-spacing', rule, {
   valid: [
 
     // even
diff --git a/tests/object-curly-even-spacing.js b/tests/object-curly-even-spacing.js
index c7de662..d646eb8 100644
--- a/tests/object-curly-even-spacing.js
+++ b/tests/object-curly-even-spacing.js
@@ -10,16 +10,16 @@
 // Requirements
 // ------------------------------------------------------------------------------
 
-var eslint = require('eslint')
-var ESLintTester = require('eslint-tester')
+var RuleTester = require('eslint').RuleTester
+var rule = require('../rules/object-curly-even-spacing')
 var ecma = { destructuring: true, modules: true }
 
 // ------------------------------------------------------------------------------
 // Tests
 // ------------------------------------------------------------------------------
 
-var eslintTester = new ESLintTester(eslint.linter)
-eslintTester.addRuleTest('rules/object-curly-even-spacing', {
+var ruleTester = new RuleTester()
+ruleTester.run('object-curly-even-spacing', rule, {
   valid: [
 
     // either
@@ -126,7 +126,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ImportDeclaration',
           line: 1,
-          column: 0
+          column: 1
         }
       ]
 
@@ -140,7 +140,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ImportDeclaration',
           line: 1,
-          column: 0
+          column: 1
         }
       ]
 
@@ -154,7 +154,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ImportDeclaration',
           line: 1,
-          column: 0
+          column: 1
         }
       ]
 
@@ -168,7 +168,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ImportDeclaration',
           line: 1,
-          column: 0
+          column: 1
         }
       ]
 
@@ -182,7 +182,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ObjectPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
 
@@ -196,7 +196,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ObjectPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
     },
@@ -209,7 +209,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: 'Expected consistent spacing',
           type: 'ObjectExpression',
           line: 1,
-          column: 8
+          column: 9
         }
       ]
     },
@@ -227,13 +227,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ImportDeclaration',
           line: 1,
-          column: 7
+          column: 8
         },
         {
           message: "A space is required before '}'",
           type: 'ImportDeclaration',
           line: 1,
-          column: 11
+          column: 12
         }
       ]
     },
@@ -248,13 +248,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ExportNamedDeclaration',
           line: 1,
-          column: 7
+          column: 8
         },
         {
           message: "A space is required before '}'",
           type: 'ExportNamedDeclaration',
           line: 1,
-          column: 11
+          column: 12
         }
       ]
     },
@@ -290,7 +290,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 42
+          column: 43
         }
       ]
     },
@@ -302,7 +302,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 60
+          column: 61
         }
       ]
     },
@@ -317,7 +317,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 8
+          column: 9
         }
       ]
     },
@@ -330,7 +330,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 8
+          column: 9
         }
       ]
     },
@@ -344,7 +344,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 38
+          column: 39
         }
       ]
     },
@@ -356,7 +356,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 54
+          column: 55
         }
       ]
     },
@@ -370,13 +370,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 10
+          column: 11
         },
         {
           message: "A space is required before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 29
+          column: 30
         }
       ]
     },
@@ -388,7 +388,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 10
+          column: 11
         }
       ]
     },
@@ -400,7 +400,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 30
+          column: 31
         }
       ]
     },
@@ -412,13 +412,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 10
+          column: 11
         },
         {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 31
+          column: 32
         }
       ]
     },
@@ -430,7 +430,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 30
+          column: 31
         }
       ]
     },
@@ -442,7 +442,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 10
+          column: 11
         }
       ]
     },
@@ -454,13 +454,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 10
+          column: 11
         },
         {
           message: "There should be no space after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 17
+          column: 18
         }
       ]
     },
@@ -472,13 +472,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 27
+          column: 28
         },
         {
           message: "There should be no space before '}'",
           type: 'ObjectExpression',
           line: 1,
-          column: 39
+          column: 40
         }
       ]
     },
@@ -494,7 +494,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ObjectExpression',
           line: 1,
-          column: 21
+          column: 22
         }
       ]
     },
@@ -509,13 +509,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ObjectPattern',
           line: 1,
-          column: 4
+          column: 5
         },
         {
           message: "A space is required before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 9
+          column: 10
         }
       ]
     },
@@ -528,7 +528,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 10
+          column: 11
         }
       ]
     },
@@ -541,13 +541,13 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space after '{'",
           type: 'ObjectPattern',
           line: 1,
-          column: 4
+          column: 5
         },
         {
           message: "There should be no space before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 11
+          column: 12
         }
       ]
     },
@@ -560,7 +560,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "There should be no space before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 10
+          column: 11
         }
       ]
     },
@@ -573,7 +573,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required before '}'",
           type: 'ObjectPattern',
           line: 1,
-          column: 10
+          column: 11
         }
       ]
     },
@@ -586,7 +586,7 @@ eslintTester.addRuleTest('rules/object-curly-even-spacing', {
           message: "A space is required after '{'",
           type: 'ObjectPattern',
           line: 1,
-          column: 4
+          column: 5
         }
       ]
     },