diff --git a/.travis.yml b/.travis.yml
index b7d63c4..9e115ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,13 @@
 language: python
 sudo: false
-python:
-    - 2.6
-    - 2.7
-    - 3.3
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py33
+    - TOXENV=py34
 install:
-    - pip install
-    - pip install zope.catalog[test]
+    - travis_retry pip install tox
 script:
-    - python setup.py test -q
+    - tox
 notifications:
     email: false
diff --git a/setup.py b/setup.py
index d0d65a5..1c5cd09 100644
--- a/setup.py
+++ b/setup.py
@@ -53,6 +53,7 @@ def read(*rnames):
           'Programming Language :: Python :: 2.7',
           'Programming Language :: Python :: 3',
           'Programming Language :: Python :: 3.3',
+          'Programming Language :: Python :: 3.4',
           'Programming Language :: Python :: Implementation :: CPython',
           'Natural Language :: English',
           'Operating System :: OS Independent',
diff --git a/tox.ini b/tox.ini
index 6671f53..3fa701e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 envlist =
-    py26,py27,py33
+    py26,py27,py33,py34
 
 [testenv]
 commands =