diff --git a/.travis.yml b/.travis.yml
index 6022a59c9a32..41adfd06281e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,13 +34,11 @@ language: python
 
 matrix:
   include:
-    - python: 2.6
-      env: NUMPY=numpy==1.6 MOCK=mock
     - python: 2.7
-      env: MOCK=mock PANDAS=pandas
-    - python: 3.3
+      env: MOCK=mock NUMPY=numpy==1.6
     - python: 3.4
     - python: 3.5
+      env: PANDAS=pandas
     - python: 2.7
       env: TEST_ARGS=--pep8
     - python: 2.7
diff --git a/setup.py b/setup.py
index 90e2edd4e491..861712f80cab 100644
--- a/setup.py
+++ b/setup.py
@@ -119,8 +119,11 @@
     'Intended Audience :: Science/Research',
     'License :: OSI Approved :: Python Software Foundation License',
     'Programming Language :: Python',
-    'Programming Language :: Python :: 2',
+    'Programming Language :: Python :: 2.7',
     'Programming Language :: Python :: 3',
+    'Programming Language :: Python :: 3.3',
+    'Programming Language :: Python :: 3.4',
+    'Programming Language :: Python :: 3.5',
     'Topic :: Scientific/Engineering :: Visualization',
     ]