diff --git a/Gruntfile.js b/Gruntfile.js
index 1a95ef0c1d19..d1cce4964940 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@ var npmReactToolsTasks = require('./grunt/tasks/npm-react-tools');
 var versionCheckTask = require('./grunt/tasks/version-check');
 var gemReactSourceTasks = require('./grunt/tasks/gem-react-source');
 var eslintTask = require('./grunt/tasks/eslint');
+var jestTask = require('./grunt/tasks/jest');
 
 module.exports = function(grunt) {
 
@@ -56,6 +57,8 @@ module.exports = function(grunt) {
 
   grunt.registerTask('lint', ['eslint']);
 
+  grunt.registerTask('jest', jestTask);
+
   grunt.registerTask(
     'download-previous-version',
     require('./grunt/tasks/download-previous-version.js')
diff --git a/grunt/tasks/jest.js b/grunt/tasks/jest.js
new file mode 100644
index 000000000000..cc9b1a9f1128
--- /dev/null
+++ b/grunt/tasks/jest.js
@@ -0,0 +1,20 @@
+'use strict';
+
+var grunt = require('grunt');
+
+module.exports = function() {
+  var done = this.async();
+  grunt.log.writeln('running jest (this may take a while)');
+  grunt.util.spawn({
+    cmd: 'node_modules/.bin/jest',
+  }, function(err, result, code) {
+    if (err) {
+      grunt.log.error('jest failed');
+    } else {
+      grunt.log.ok('jest passed');
+    }
+    grunt.log.writeln(result.stdout);
+
+    done(code === 0);
+  });
+};
diff --git a/package.json b/package.json
index 0da4eb32fa8a..03ce7a072b58 100644
--- a/package.json
+++ b/package.json
@@ -50,10 +50,9 @@
     "grunt-contrib-connect": "~0.6.0",
     "grunt-contrib-copy": "^0.8.0",
     "grunt-contrib-jshint": "^0.10.0",
-    "grunt-jest": "^0.1.2",
     "gzip-js": "~0.3.2",
     "jasmine-tapreporter": "~0.2.2",
-    "jest-cli": "^0.2.1",
+    "jest-cli": "^0.4.0",
     "optimist": "~0.6.0",
     "phantomjs": "~1.9",
     "platform": "^1.1.0",