diff --git a/lib/babel/helpers/code-frame.js b/lib/babel/helpers/code-frame.js
index c0d290afce..b123efb6fd 100644
--- a/lib/babel/helpers/code-frame.js
+++ b/lib/babel/helpers/code-frame.js
@@ -1,8 +1,8 @@
+var lineNumbers = require("line-numbers");
 var repeating   = require("repeating");
 var jsTokens    = require("js-tokens");
-var isJSKeyword = require("is-keyword-js");
+var esutils     = require("esutils");
 var chalk       = require("chalk");
-var lineNumbers = require("line-numbers");
 var ary         = require("lodash/function/ary");
 
 var defs = {
@@ -25,9 +25,10 @@ var newline = /\r\n|[\n\r\u2028\u2029]/;
 var highlight = function (text) {
   var tokenType = function (match) {
     var token = jsTokens.matchToToken(match);
-    if (token.type === "name" && isJSKeyword(token.value)) {
+    if (token.type === "name" && esutils.keyword.isKeywordES6(token.value)) {
       return "keyword";
     }
+
     if (token.type === "punctuation") {
       switch (token.value) {
         case "{":
@@ -41,6 +42,7 @@ var highlight = function (text) {
           return "square";
       }
     }
+
     return token.type;
   };
 
diff --git a/package.json b/package.json
index 748694ab24..6a551ad3a4 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,6 @@
     "fs-readdir-recursive": "^0.1.0",
     "globals": "^6.2.0",
     "is-integer": "^1.0.4",
-    "is-keyword-js": "^1.0.3",
     "js-tokens": "~0.4.1",
     "leven": "^1.0.1",
     "line-numbers": "~0.2.0",