diff --git a/gruntfile.js b/gruntfile.js
index 96218e07..e7680267 100644
--- a/gruntfile.js
+++ b/gruntfile.js
@@ -40,11 +40,16 @@ module.exports = function(grunt) {
 				},
 				command: 'php run.php --config <%= phpCheckStyleConfigPath %> --src <%= phpSourcesDir %> --exclude di.php --format console',
 			},
+
+			tests: {
+				command: 'phpunit --strict --bootstrap src/AutoLoader.php tests/',
+			},
 		},
 	});
 
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-shell');
 	grunt.registerTask('default', ['jshint', 'shell']);
+	grunt.registerTask('tests', ['shell:tests']);
 
 };
diff --git a/run-tests.sh b/run-tests.sh
deleted file mode 100755
index ff0959d1..00000000
--- a/run-tests.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-phpunit --strict --bootstrap src/AutoLoader.php tests/