diff --git a/.travis.yml b/.travis.yml
index 33409c733..02f2bae6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,7 @@ language: python
 python:
   - "2.7"
   - "3.4"
+  - "3.5"
 # command to install dependencies
 install:
   - "pip install -r requirements.txt"
diff --git a/setup.py b/setup.py
index 17640181f..91485b791 100644
--- a/setup.py
+++ b/setup.py
@@ -51,5 +51,20 @@ setup(
     include_package_data=True,
     long_description="""\
     Python client for kubernetes http://kubernetes.io/
-    """
+    """,
+    classifiers=[
+        "Development Status :: 4 - Alpha",
+        "Environment :: Kubernetes",
+        "Topic :: Utilities",
+        "Intended Audience :: Developers",
+        "Intended Audience :: Information Technology",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: OS Independent",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2",
+        "Programming Language :: Python :: 2.7",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+    ],
 )
diff --git a/tox.ini b/tox.ini
index d99517b76..74c67893c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27, py34
+envlist = py27, py34, py35
 
 [testenv]
 deps=-r{toxinidir}/requirements.txt
@@ -7,4 +7,4 @@ deps=-r{toxinidir}/requirements.txt
        
 commands=
    nosetests \
-      []
\ No newline at end of file
+      []