diff --git a/.travis.yml b/.travis.yml
index 837cb79f..805cafc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ python:
   - 3.2
   - 3.3
   - 3.4
+  - 3.5
 
 install: python setup.py build_ext -i
 
 script: python run-tests.py
-
diff --git a/setup.py b/setup.py
index 237b407b..fb575784 100755
--- a/setup.py
+++ b/setup.py
@@ -96,6 +96,7 @@ def _find_platform_headers():
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Operating System :: OS Independent',
         'Topic :: Software Development :: Libraries :: Python Modules'],
     **setuptools_args)