diff --git a/.jshintrc b/.jshintrc
index 7136edbda9..b36c317d67 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -8,7 +8,23 @@
   "eqnull": true,
   "quotmark": "single",
   "trailing": true,
+  "undef": true,
+  "browser": true,
+  "jquery": true,
   "globals": {
-    "angular": true
+    "angular": false,
+
+    // For Jasmine
+    "after"      : false,
+    "afterEach"  : false,
+    "before"     : false,
+    "beforeEach" : false,
+    "describe"   : false,
+    "expect"     : false,
+    "jasmine"    : false,
+    "module"     : false,
+    "spyOn"      : false,
+    "inject"     : false,
+    "it"         : false
   }
 }
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 7d7412b99d..9bf4425f07 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,3 +1,4 @@
+/* jshint node: true */
 var markdown = require('node-markdown').Markdown;
 
 module.exports = function(grunt) {