diff --git a/setup.py b/setup.py
index 74f490820c..5e6bac0878 100755
--- a/setup.py
+++ b/setup.py
@@ -43,6 +43,7 @@
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.2",
         "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.4",
         "Topic :: Software Development :: Libraries :: Python Modules",
         "Topic :: Communications :: Telephony",
         ],
diff --git a/tox.ini b/tox.ini
index 98bc5da1ac..5249597112 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, pypy
+envlist = py26, py27, py32, py33, py34, pypy
 
 [testenv]
 deps= -r{toxinidir}/tests/requirements.txt