diff --git a/.gitignore b/.gitignore
index a007feab..96218bcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 build/*
+node_modules/*
+test/*
diff --git a/.travis.yaml b/.travis.yaml
index 12b2631c..e657557a 100644
--- a/.travis.yaml
+++ b/.travis.yaml
@@ -1,4 +1,4 @@
-language: node_js
+language: 
+  node_js
 node_js:
   - 0.8
-  - 0.6
diff --git a/grunt.js b/grunt.js
index 0a5009b2..82373173 100644
--- a/grunt.js
+++ b/grunt.js
@@ -42,9 +42,16 @@ module.exports = function(grunt) {
                 dest: 'build/openseadragon.min.js'
             }
         },
+        qunit: {
+            all: ['http://localhost:8000/test/test.html']
+        },
+        server: {
+            port: 8000,
+            base: '.'
+        },
         watch: {
             files: ['grunt.js', 'src/*.js'],
-            tasks: 'concat'
+            tasks: 'concat min'
         },
         jshint: {
             options: {
@@ -105,7 +112,6 @@ module.exports = function(grunt) {
         }
     });
 
-    // Default task.
     grunt.registerTask('default', 'concat min');
-
+    grunt.registerTask('test', 'concat min server qunit');
 };
diff --git a/package.json b/package.json
index 4b61ba1b..835f8ff0 100644
--- a/package.json
+++ b/package.json
@@ -2,5 +2,5 @@
     "name": "openseadragon",
     "version": "0.9.95",
     "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
-    "dependencies": ["grunt"]
-}
\ No newline at end of file
+    "dependencies": ["grunt", "qunitjs", "phantomjs"]
+}