diff --git a/Gruntfile.js b/Gruntfile.js
index 8040abad..bae0c888 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -192,6 +192,10 @@ module.exports = function(grunt) {
     shell: {
       gitAdd: {
         command: 'git add build/'
+      },
+      casperTest: {
+        command: 'casperjs test ./src/__tests__/casperjs/*.js || ' +
+          'open ./src/__tests__/casperjs/screenshots/*.png'
       }
     },
     jasmine_node: {
@@ -226,13 +230,14 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-uglify');
 
   grunt.registerTask('build',
-    ['clean', 'browserify', 'uglify', 'hash', 'buildIndex', 'shell', 'jasmine_node', 'jshint', 'lintStrings', 'compliment']
+    ['clean', 'browserify', 'uglify', 'hash', 'buildIndex', 'shell:gitAdd', 'jasmine_node', 'jshint', 'lintStrings', 'compliment']
   );
   grunt.registerTask('lint', ['jshint', 'compliment']);
   grunt.registerTask('fastBuild', ['clean', 'browserify', 'hash', 'buildIndexDev', 'jshint']);
   grunt.registerTask('watching', ['fastBuild', 'jasmine_node', 'jshint', 'lintStrings']);
 
   grunt.registerTask('default', ['build']);
-  grunt.registerTask('test', ['jasmine_node']);
+  grunt.registerTask('test', ['jasmine_node', 'shell:casperTest']);
+  grunt.registerTask('casperTest', ['shell:casperTest']);
 };
 
diff --git a/src/__tests__/casperjs/casperUtils.js b/src/__tests__/casperjs/casperUtils.js
index 4012534b..afb34b1a 100644
--- a/src/__tests__/casperjs/casperUtils.js
+++ b/src/__tests__/casperjs/casperUtils.js
@@ -1,5 +1,6 @@
 
 var screenshotCounter = 0;
+var screenshotRoot = './src/__tests__/casperjs/screenshots/entirePage';
 
 var CasperUtils = {
 
@@ -83,7 +84,7 @@ var CasperUtils = {
     entirePage: function () {
       screenshotCounter++;
 
-      casper.capture('screenshots/entirePage' + screenshotCounter + '.png', {
+      casper.capture(screenshotRoot + screenshotCounter + '.png', {
         top: 0,
         left: 0,
         // These seem to be the hardcoded viewport dimensions