diff --git a/.travis.yml b/.travis.yml
index bae458e..fdbdf2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ python:
   - 2.6
   - 2.7
   - 3.3
-
+  - 3.4
 
 install:
   - pip install -e ".[test]"
diff --git a/setup.py b/setup.py
index 825659e..57b431e 100644
--- a/setup.py
+++ b/setup.py
@@ -91,6 +91,12 @@ setup(
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]
diff --git a/tox.ini b/tox.ini
index cf07b86..31e939b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py33
+envlist = py26, py27, py33, py34
 
 [testenv]
 commands = pip install -e ".[test]"