diff --git a/.eslintignore b/.eslintignore
deleted file mode 120000
index 3e4e48b..0000000
--- a/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-.gitignore
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
index db21f05..8fb0de3 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,16 +1,15 @@
 ---
-# babel support more syntax stuff than eslint for now
-parser: babel-eslint
 
 root: true
 extends: eslint:recommended
 
-ecmaFeatures:
-  modules: true
+parserOptions:
+  sourceType: "module"
+  ecmaVersion: 6
+  ecmaFeatures:
+    experimentalObjectRestSpread: true
 
 env:
-  es6: true
-  browser: true
   node: true
 
 rules:
@@ -35,7 +34,7 @@ rules:
   computed-property-spacing: [2, "never"]
 
   space-unary-ops: [2, {"words": true, "nonwords": false}]
-  space-after-keywords: [2, "always"]
+  keyword-spacing: [2, {"before": true, "after": true}]
   space-before-blocks: [2, "always"]
   space-before-function-paren: [2, "never"]
   space-in-parens: [2, "never"]
diff --git a/.travis.yml b/.travis.yml
index ffb8b39..39024ba 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - iojs
-  - "0.12"
-  - "0.10"
+  - stable
+  - "6"
+  - "4"
diff --git a/package.json b/package.json
index 12c204c..fcf7c97 100644
--- a/package.json
+++ b/package.json
@@ -24,21 +24,19 @@
     "README-zh.md"
   ],
   "dependencies": {
-    "balanced-match": "^0.2.0",
     "postcss": "^5.0.0",
     "postcss-selector-matches": "^2.0.0"
   },
   "devDependencies": {
     "babel": "^5.5.8",
-    "babel-eslint": "^3.1.15",
     "babel-tape-runner": "^1.1.0",
-    "eslint": "^1.0.0",
+    "eslint": "^3.15.0",
     "tape": "^4.0.0"
   },
   "scripts": {
     "prepublish": "babel src --out-dir dist",
-    "lint": "eslint .",
-    "tape": "babel-tape-runner 'test/*.js'",
+    "lint": "eslint src test",
+    "tape": "babel-tape-runner test/*.js",
     "test": "npm run lint && npm run tape"
   }
 }
diff --git a/test/index.js b/test/index.js
index 8dc2e09..5fadaec 100644
--- a/test/index.js
+++ b/test/index.js
@@ -11,9 +11,9 @@ function transform(input, opts = {}, postcssOpts = {}) {
 test("@custom-selector", function(t) {
   t.equal(
     transform(
-      ``
+      ""
     ).css,
-    ``,
+    "",
     "should works with nothing"
   )