diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..f563239
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,5 @@
+language: node_js
+node_js:
+  - "0.10"
+before_install:
+  - npm install -g grunt-cli
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index 3740aa7..2479734 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -135,5 +135,8 @@ module.exports = function(grunt) {
 	// Build files and refresh content on file changes
 	grunt.registerTask('dev', ['default', 'notify:watch', 'watch']);
 
+	// Run tests
+	grunt.registerTask('test', ['jshint']);
+	
 	grunt.task.run('notify_hooks');
 };
\ No newline at end of file
diff --git a/package.json b/package.json
index 7385431..bc15889 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "3D city and data visualisation platform",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "grunt test --verbose"
   },
   "author": "Robin Hawkes & Peter Smart",
   "license": "MIT",