diff --git a/.travis.yml b/.travis.yml
index 0688c6d..0512948 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ env: # These should match the tox env list
     - TOXENV=py26
     - TOXENV=py27
     - TOXENV=py33
+    - TOXENV=py34
     - TOXENV=pypy
 install: pip install tox --use-mirrors
 script: tox
diff --git a/setup.py b/setup.py
index 5454b48..14bd82e 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,7 @@ setup(
         'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: Implementation :: PyPy',
     ],
 
diff --git a/tox.ini b/tox.ini
index f99bbc5..dbdcaec 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 project = pre_commit_hooks
 # These should match the travis env list
-envlist = py26,py27,py33,pypy
+envlist = py26,py27,py33,py34,pypy
 
 [testenv]
 install_command = pip install --use-wheel {opts} {packages}