diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..3c0d4fc5e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: node_js
+node_js:
+  - "0.11"
+  - "0.10"
+
+before_script:
+  - npm install
+
+script:
+  - gulp jshint
+  - cp Chart.min.js /tmp/OLD
+  - gulp build
+  - cmp Chart.min.js /tmp/OLD # ensure build was run before commit
+
+notifications:
+  email:
+    hello@nickdownie.com
diff --git a/README.md b/README.md
index a7db2c950..f137c190b 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Chart.js
+# Chart.js [![Build Status](https://travis-ci.org/nnnick/Chart.js.svg?branch=master)](https://travis-ci.org/nnnick/Chart.js)
 
 [![Code Climate](https://codeclimate.com/github/nnnick/Chart.js/badges/gpa.svg)](https://codeclimate.com/github/nnnick/Chart.js)
 
diff --git a/gulpfile.js b/gulpfile.js
index 4a435bd2a..af4d7b017 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -6,6 +6,7 @@ var gulp = require('gulp'),
 	size = require('gulp-size'),
 	connect = require('gulp-connect'),
 	replace = require('gulp-replace'),
+	htmlv = require('gulp-html-validator'),
 	inquirer = require('inquirer'),
 	semver = require('semver'),
 	exec = require('child_process').exec,
@@ -90,6 +91,11 @@ gulp.task('jshint', function(){
 		.pipe(jshint.reporter('default'));
 });
 
+gulp.task('valid', function(){
+	return gulp.src('samples/*.html')
+    .pipe(htmlv());
+});
+
 gulp.task('library-size', function(){
 	return gulp.src('Chart.min.js')
 		.pipe(size({
diff --git a/package.json b/package.json
index 2e0757553..4c3d89f75 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,8 @@
     "gulp-size": "~0.4.0",
     "gulp-uglify": "~0.2.x",
     "gulp-util": "~2.2.x",
+    "gulp-html-validator": "^0.0.2",
     "inquirer": "^0.5.1",
     "semver": "^3.0.1"
   }
-}
\ No newline at end of file
+}