diff --git a/eslint/babel-eslint-plugin/package.json b/eslint/babel-eslint-plugin/package.json
index 1487c6b706..fe4173229d 100644
--- a/eslint/babel-eslint-plugin/package.json
+++ b/eslint/babel-eslint-plugin/package.json
@@ -4,7 +4,7 @@
   "description": "an eslint rule plugin companion to babel-eslint",
   "main": "index.js",
   "scripts": {
-    "test": "mocha ./tests/*.js"
+    "test": "mocha ./tests/rules/*.js"
   },
   "repository": {
     "type": "git",
@@ -27,10 +27,8 @@
     "eslint": ">=1.0.0"
   },
   "devDependencies": {
-    "babel-eslint": "^4.0.7",
-    "eslint": "^1.1.0",
-    "is-my-json-valid": "^2.12.0",
-    "mocha": "^2.2.5",
-    "phantomjs": "^1.9.17"
+    "babel-eslint": "^6.1.0",
+    "eslint": "^2.13.1",
+    "mocha": "^2.2.5"
   }
 }
diff --git a/eslint/babel-eslint-plugin/tests/RuleTester.js b/eslint/babel-eslint-plugin/tests/RuleTester.js
new file mode 100644
index 0000000000..e183277bfb
--- /dev/null
+++ b/eslint/babel-eslint-plugin/tests/RuleTester.js
@@ -0,0 +1,7 @@
+var RuleTester = require("eslint").RuleTester;
+
+RuleTester.setDefaultConfig({
+    parser: 'babel-eslint'
+});
+
+module.exports = RuleTester;
diff --git a/eslint/babel-eslint-plugin/tests/array-bracket-spacing.js b/eslint/babel-eslint-plugin/tests/rules/array-bracket-spacing.js
similarity index 99%
rename from eslint/babel-eslint-plugin/tests/array-bracket-spacing.js
rename to eslint/babel-eslint-plugin/tests/rules/array-bracket-spacing.js
index e4d743d254..ea5aa2f458 100644
--- a/eslint/babel-eslint-plugin/tests/array-bracket-spacing.js
+++ b/eslint/babel-eslint-plugin/tests/rules/array-bracket-spacing.js
@@ -9,8 +9,8 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require('../rules/array-bracket-spacing'),
-    RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/array-bracket-spacing'),
+    RuleTester = require('../RuleTester');
 
 //------------------------------------------------------------------------------
 // Tests
diff --git a/eslint/babel-eslint-plugin/tests/arrow-parens.js b/eslint/babel-eslint-plugin/tests/rules/arrow-parens.js
similarity index 98%
rename from eslint/babel-eslint-plugin/tests/arrow-parens.js
rename to eslint/babel-eslint-plugin/tests/rules/arrow-parens.js
index f129f77f71..1962be7b88 100644
--- a/eslint/babel-eslint-plugin/tests/arrow-parens.js
+++ b/eslint/babel-eslint-plugin/tests/rules/arrow-parens.js
@@ -11,8 +11,8 @@
 // Requirements
 //------------------------------------------------------------------------------
 
-var rule = require("../rules/arrow-parens"),
-    RuleTester = require('eslint').RuleTester;
+var rule = require("../../rules/arrow-parens"),
+    RuleTester = require('../RuleTester');
 
 function ok(code, args){
   return { code: code, options: args,  parser: 'babel-eslint' }
diff --git a/eslint/babel-eslint-plugin/tests/flow-object-type.js b/eslint/babel-eslint-plugin/tests/rules/flow-object-type.js
similarity index 94%
rename from eslint/babel-eslint-plugin/tests/flow-object-type.js
rename to eslint/babel-eslint-plugin/tests/rules/flow-object-type.js
index f98c632664..9d34036b0f 100644
--- a/eslint/babel-eslint-plugin/tests/flow-object-type.js
+++ b/eslint/babel-eslint-plugin/tests/rules/flow-object-type.js
@@ -5,8 +5,8 @@
 
 "use strict";
 
-var rule = require("../rules/flow-object-type"),
-    RuleTester = require('eslint').RuleTester;
+var rule = require("../../rules/flow-object-type"),
+    RuleTester = require('../RuleTester');
 
 var features = {
 };
diff --git a/eslint/babel-eslint-plugin/tests/func-params-comma-dangle.js b/eslint/babel-eslint-plugin/tests/rules/func-params-comma-dangle.js
similarity index 99%
rename from eslint/babel-eslint-plugin/tests/func-params-comma-dangle.js
rename to eslint/babel-eslint-plugin/tests/rules/func-params-comma-dangle.js
index 9fc5c2110f..a1676e4fc4 100644
--- a/eslint/babel-eslint-plugin/tests/func-params-comma-dangle.js
+++ b/eslint/babel-eslint-plugin/tests/rules/func-params-comma-dangle.js
@@ -1,7 +1,7 @@
 'use strict';
 
-var rule = require('../rules/func-params-comma-dangle');
-var RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/func-params-comma-dangle');
+var RuleTester = require('../RuleTester');
 
 var MISSING_I = [{message: 'Missing trailing comma.', type: 'Identifier'}];
 var MISSING_AP = [{message: 'Missing trailing comma.', type: 'AssignmentPattern'}];
diff --git a/eslint/babel-eslint-plugin/tests/generator-star-spacing.js b/eslint/babel-eslint-plugin/tests/rules/generator-star-spacing.js
similarity index 99%
rename from eslint/babel-eslint-plugin/tests/generator-star-spacing.js
rename to eslint/babel-eslint-plugin/tests/rules/generator-star-spacing.js
index cf93add7c9..86438a940c 100644
--- a/eslint/babel-eslint-plugin/tests/generator-star-spacing.js
+++ b/eslint/babel-eslint-plugin/tests/rules/generator-star-spacing.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
-var rule = require('../rules/generator-star-spacing'),
-    RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/generator-star-spacing'),
+    RuleTester = require('../RuleTester');
 
 var features = {
     generators: true
diff --git a/eslint/babel-eslint-plugin/tests/new-cap.js b/eslint/babel-eslint-plugin/tests/rules/new-cap.js
similarity index 98%
rename from eslint/babel-eslint-plugin/tests/new-cap.js
rename to eslint/babel-eslint-plugin/tests/rules/new-cap.js
index b7a9da45a0..5fe53cbe39 100644
--- a/eslint/babel-eslint-plugin/tests/new-cap.js
+++ b/eslint/babel-eslint-plugin/tests/rules/new-cap.js
@@ -5,8 +5,8 @@
  * @author Nicholas C. Zakas
  */
 
-var rule = require('../rules/new-cap'),
-    RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/new-cap'),
+    RuleTester = require('../RuleTester');
 
 var ruleTester = new RuleTester();
 ruleTester.run('babel/new-cap', rule, {
diff --git a/eslint/babel-eslint-plugin/tests/no-await-in-loop.js b/eslint/babel-eslint-plugin/tests/rules/no-await-in-loop.js
similarity index 96%
rename from eslint/babel-eslint-plugin/tests/no-await-in-loop.js
rename to eslint/babel-eslint-plugin/tests/rules/no-await-in-loop.js
index ba82e4e78c..97de50fdd9 100644
--- a/eslint/babel-eslint-plugin/tests/no-await-in-loop.js
+++ b/eslint/babel-eslint-plugin/tests/rules/no-await-in-loop.js
@@ -5,8 +5,8 @@
 
 "use strict";
 
-var rule = require("../rules/no-await-in-loop"),
-    RuleTester = require('eslint').RuleTester;
+var rule = require("../../rules/no-await-in-loop"),
+    RuleTester = require('../RuleTester');
 
 var features = {
 };
diff --git a/eslint/babel-eslint-plugin/tests/object-curly-spacing.js b/eslint/babel-eslint-plugin/tests/rules/object-curly-spacing.js
similarity index 99%
rename from eslint/babel-eslint-plugin/tests/object-curly-spacing.js
rename to eslint/babel-eslint-plugin/tests/rules/object-curly-spacing.js
index 5e70fc5bbc..44c188fdd0 100644
--- a/eslint/babel-eslint-plugin/tests/object-curly-spacing.js
+++ b/eslint/babel-eslint-plugin/tests/rules/object-curly-spacing.js
@@ -8,8 +8,8 @@
  * @copyright 2015 Mathieu M-Gosselin. All rights reserved.
  */
 
-var rule = require('../rules/object-curly-spacing'),
-    RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/object-curly-spacing'),
+    RuleTester = require('../RuleTester');
 
 var ruleTester = new RuleTester();
 ruleTester.run('babel/object-curly-spacing', rule, {
diff --git a/eslint/babel-eslint-plugin/tests/object-shorthand.js b/eslint/babel-eslint-plugin/tests/rules/object-shorthand.js
similarity index 98%
rename from eslint/babel-eslint-plugin/tests/object-shorthand.js
rename to eslint/babel-eslint-plugin/tests/rules/object-shorthand.js
index 0dfe5fb51c..c35c086b51 100644
--- a/eslint/babel-eslint-plugin/tests/object-shorthand.js
+++ b/eslint/babel-eslint-plugin/tests/rules/object-shorthand.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
-var rule = require('../rules/object-shorthand'),
-    RuleTester = require('eslint').RuleTester;
+var rule = require('../../rules/object-shorthand'),
+    RuleTester = require('../RuleTester');
 
 var features = {
     objectLiteralShorthandMethods: true,