diff --git a/grunt/.jshintrc b/grunt/.jshintrc
index d357212cc2..f79ed0cac1 100644
--- a/grunt/.jshintrc
+++ b/grunt/.jshintrc
@@ -7,6 +7,5 @@
   "node"     : true,
   "nonbsp"   : true,
   "strict"   : true,
-  "trailing" : true,
   "undef"    : true
 }
diff --git a/js/.jscsrc b/js/.jscsrc
index ceaffbcd50..2da777a222 100644
--- a/js/.jscsrc
+++ b/js/.jscsrc
@@ -7,6 +7,7 @@
   "disallowRightStickedOperators": ["?", "/", "*", ":", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
   "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
   "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+  "disallowTrailingWhitespace": true,
   "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireLeftStickedOperators": [","],
   "requireLineFeedAtFileEnd": true,