diff --git a/app/templates/.jscs.json b/app/templates/.jscsrc
similarity index 98%
rename from app/templates/.jscs.json
rename to app/templates/.jscsrc
index 99393d5f6..76b4a9aaa 100644
--- a/app/templates/.jscs.json
+++ b/app/templates/.jscsrc
@@ -1,4 +1,5 @@
 {
+  "esnext": true,
   "maximumLineLength": {
     "value": 100,
     "allowComments": true,
diff --git a/app/templates/Gruntfile.js b/app/templates/Gruntfile.js
index cc3d414e0..1c3ad2bfc 100644
--- a/app/templates/Gruntfile.js
+++ b/app/templates/Gruntfile.js
@@ -165,7 +165,7 @@ module.exports = function (grunt) {
 
     jscs: {
       options: {
-        config: ".jscs.json"
+        config: ".jscsrc"
       },
       main: {
         files: {
diff --git a/app/templates/_package.json b/app/templates/_package.json
index 4e4490510..217df92ab 100644
--- a/app/templates/_package.json
+++ b/app/templates/_package.json
@@ -55,7 +55,7 @@
     "karma-babel-preprocessor": "^5.2.1",<% } %>
     "grunt-babel": "~5.0.0",
     "grunt-google-cdn": "~0.4.0",
-    "grunt-jscs": "^2.0.0",
+    "grunt-jscs": "^2.1.0",
     "grunt-newer": "^1.1.1",
     "grunt-ng-annotate": "^1.0.1",
     "grunt-ng-constant": "^1.1.0",
diff --git a/test/test-file-creation.js b/test/test-file-creation.js
index ef4a3e8e4..555036c94 100644
--- a/test/test-file-creation.js
+++ b/test/test-file-creation.js
@@ -212,7 +212,7 @@ describe('angular-fullstack generator', function () {
       '.gitattributes',
       '.gitignore',
       '.travis.yml',
-      '.jscs.json',
+      '.jscsrc',
       '.yo-rc.json',
       'Gruntfile.js',
       'package.json',