diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..aa9797b
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,7 @@
+language: java
+jdk:
+  - openjdk6
+  - openjdk7
+  - oraclejdk7
+install: make travis-install
+script: make test
diff --git a/Makefile b/Makefile
index 46e2c0e..ed635ce 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+PATH := ./redis-git/src:${PATH}
+
 define REDIS1_CONF
 daemonize yes
 port 6379
@@ -254,4 +256,8 @@ release:
 	mvn release:perform
 	make stop
 
+travis-install:
+	[ ! -e redis-git ] && git clone https://github.com/antirez/redis.git redis-git || true
+	make -C redis-git -j4
+
 .PHONY: test