diff --git a/.travis.mk b/.travis.mk
index 349ade3..113f003 100644
--- a/.travis.mk
+++ b/.travis.mk
@@ -2,7 +2,7 @@ all: $(shell uname -s)
 
 Linux:
 	sudo apt-get update
-	sudo apt-get install libasyncns-dev check memcached valgrind
+	sudo apt-get install libasyncns-dev check memcached valgrind -y
 	pip install cffi pytest pylint
 	$(MAKE) all
 	# We don't need to run C unit tests under valgrind for every python
diff --git a/.travis.yml b/.travis.yml
index 0c40448..51c1970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 script: make -f .travis.mk
+sudo: required
+dist: trusty
 
 matrix:
   include:
@@ -10,6 +12,16 @@ matrix:
       python: "2.6"
       compiler: gcc
       env: CC=gcc
+    - os: linux
+      language: python
+      python: "2.6"
+      compiler: clang
+      env: CC=clang
+    - os: linux
+      language: python
+      python: "2.7"
+      compiler: gcc
+      env: CC=gcc
     - os: linux
       language: python
       python: "2.7"
@@ -20,13 +32,59 @@ matrix:
       python: "3.3"
       compiler: gcc
       env: CC=gcc
+    - os: linux
+      language: python
+      python: "3.3"
+      compiler: clang
+      env: CC=clang
+    - os: linux
+      language: python
+      python: "3.4"
+      compiler: gcc
+      env: CC=gcc
     - os: linux
       language: python
       python: "3.4"
       compiler: clang
       env: CC=clang
+    - os: linux
+      language: python
+      python: "3.5"
+      compiler: gcc
+      env: CC=gcc
+    - os: linux
+      language: python
+      python: "3.5"
+      compiler: clang
+      env: CC=clang
+    - os: linux
+      language: python
+      python: "pypy"
+      compiler: gcc
+      env: CC=gcc
     - os: linux
       language: python
       python: "pypy"
       compiler: clang
       env: CC=clang
+    # pypy 4.0.1
+    - os: linux
+      language: python
+      python: "pypy"
+      compiler: gcc
+      env:
+        - CC=gcc PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH"
+      before_install:
+        - eval "$(pyenv init -)"
+        - pyenv install pypy-4.0.1
+        - pyenv global pypy-4.0.1
+    - os: linux
+      language: python
+      python: "pypy"
+      compiler: clang
+      env:
+        - CC=clang PYENV_ROOT="$HOME/.pyenv" PATH="$PYENV_ROOT/bin:$PATH"
+      before_install:
+        - eval "$(pyenv init -)"
+        - pyenv install pypy-4.0.1
+        - pyenv global pypy-4.0.1