diff --git a/.travis.yml b/.travis.yml
index 8f79b9d..fcc909b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,16 @@
 sudo: false
-services:
-  - redis-server
 language: python
 python:
   - 2.6
   - 2.7
   - pypy
 install:
+  - make redis
   - pip install redis --use-mirrors
-script:  make test
+env:
+  - REDIS_VERSION=3.0.7
+  - REDIS_VERSION=3.2.8
+matrix:
+  allow_failures:
+    - env: REDIS_VERSION=3.2.8
+script: make test
diff --git a/Makefile b/Makefile
index 748c504..d7c7b9e 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,26 @@ qless.lua: qless-lib.lua api.lua
 		egrep -v '^[[:space:]]*--[^\[]' | \
 		egrep -v '^--$$' >> qless.lua
 
+REDIS_VERSION ?= stable
+REDIS_DIR = redis-$(REDIS_VERSION)
+REDIS_TAR = redis-$(REDIS_VERSION).tar.gz
+REDIS_BIN = $(REDIS_DIR)/src/redis-server
+
+.PHONY: clean test redis
 clean:
-	rm -f qless.lua qless-lib.lua
+	rm -rf qless.lua qless-lib.lua $(REDIS_TAR) $(REDIS_DIR)
 
-.PHONY: test
 test: qless.lua *.lua
 	nosetests --exe -v
+
+$(REDIS_TAR):
+	curl -O http://download.redis.io/releases/$(REDIS_TAR)
+
+$(REDIS_DIR): $(REDIS_TAR)
+	tar xvf $(REDIS_TAR)
+
+$(REDIS_BIN): $(REDIS_DIR)
+	cd $(REDIS_DIR) && make
+
+redis: $(REDIS_BIN)
+	$(REDIS_BIN) --daemonize yes