diff --git a/eslint/babel-eslint-parser/.gitignore b/eslint/babel-eslint-parser/.gitignore
index 3c3629e647..93f1361991 100644
--- a/eslint/babel-eslint-parser/.gitignore
+++ b/eslint/babel-eslint-parser/.gitignore
@@ -1 +1,2 @@
 node_modules
+npm-debug.log
diff --git a/eslint/babel-eslint-parser/.gitmodules b/eslint/babel-eslint-parser/.gitmodules
new file mode 100644
index 0000000000..e922d16a44
--- /dev/null
+++ b/eslint/babel-eslint-parser/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "eslint"]
+	path = eslint
+	url = https://github.com/eslint/eslint
diff --git a/eslint/babel-eslint-parser/.npmignore b/eslint/babel-eslint-parser/.npmignore
new file mode 100644
index 0000000000..9096200b7c
--- /dev/null
+++ b/eslint/babel-eslint-parser/.npmignore
@@ -0,0 +1 @@
+eslint
diff --git a/eslint/babel-eslint-parser/eslint b/eslint/babel-eslint-parser/eslint
new file mode 160000
index 0000000000..b89d293dcf
--- /dev/null
+++ b/eslint/babel-eslint-parser/eslint
@@ -0,0 +1 @@
+Subproject commit b89d293dcff77b52eb39902e1e2453fc6678850a
diff --git a/eslint/babel-eslint-parser/eslint-tester.js b/eslint/babel-eslint-parser/eslint-tester.js
new file mode 100644
index 0000000000..52924fa939
--- /dev/null
+++ b/eslint/babel-eslint-parser/eslint-tester.js
@@ -0,0 +1,6 @@
+var ESLintTester = require("./eslint/node_modules/eslint-tester");
+
+console.log("Use babel-eslint for test suite");
+ESLintTester.setDefaultConfig({
+    parser: "../../index"
+});
diff --git a/eslint/babel-eslint-parser/package.json b/eslint/babel-eslint-parser/package.json
index 8fab55c0a1..c33550c811 100644
--- a/eslint/babel-eslint-parser/package.json
+++ b/eslint/babel-eslint-parser/package.json
@@ -13,6 +13,8 @@
     "lodash.pick": "^3.1.0"
   },
   "scripts": {
+    "bootstrap": "git submodule update --init && cd eslint && npm install",
+    "eslint": "cd eslint && mocha -c tests/lib/rules/**/*.js -r ../eslint-tester.js",
     "test": "mocha"
   },
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
@@ -22,7 +24,8 @@
   },
   "homepage": "https://github.com/babel/babel-eslint",
   "devDependencies": {
-    "eslint": "^0.22.1",
+    "eslint": "^0.21.2",
+    "eslint-tester": "^0.7.0",
     "espree": "^2.0.0",
     "mocha": "^2.1.0"
   }