diff --git a/Gruntfile.js b/Gruntfile.js
index 3be3c0d8..c95055b9 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -222,7 +222,18 @@ module.exports = function(grunt) {
           statusCheckAttempts: 200
         }
       },
-    }
+    },
+
+    watch: {
+      src: {
+        files: ['src/**/*.js'],
+        tasks: ['browserify:openpgp']
+      },
+      test: {
+        files: ['test/*.js', 'test/crypto/**/*.js', 'test/general/**/*.js', 'test/worker/**/*.js'],
+        tasks: ['browserify:unittests']
+      }
+    },
   });
 
   // Load the plugin(s)
@@ -239,6 +250,7 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-clean');
   grunt.loadNpmTasks('grunt-contrib-connect');
   grunt.loadNpmTasks('grunt-saucelabs');
+  grunt.loadNpmTasks('grunt-contrib-watch');
 
   grunt.registerTask('set_version', function() {
     if (!version) {
diff --git a/package.json b/package.json
index 5cd8c214..738ac62b 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
     "grunt-contrib-copy": "~0.8.0",
     "grunt-contrib-jshint": "~0.12.0",
     "grunt-contrib-uglify": "~0.11.0",
+    "grunt-contrib-watch": "^0.6.1",
     "grunt-jsbeautifier": "~0.2.10",
     "grunt-jscs": "^2.7.0",
     "grunt-jsdoc": "~1.1.0",