diff --git a/.travis.yml b/.travis.yml
index 81f9acdb..0b771749 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,21 +3,22 @@ sudo: false
 language: python
 
 env:
-  - PYTHON=2.6 PANDAS=0.13.1
   - PYTHON=2.7 PANDAS=0.15.1
-  - PYTHON=3.3 PANDAS=0.14.1
   - PYTHON=3.4 PANDAS=0.16.2
   - PYTHON=3.4 PANDAS=0.17.1
   - PYTHON=3.5 PANDAS=0.17.1
+  - PYTHON=3.5 PANDAS=v0.18.0rc1
   - PYTHON=2.7 PANDAS=0.12.0
   - PYTHON=2.7 PANDAS=0.11.0
   - PYTHON=2.7 PANDAS=0.10.1
 
 matrix:
     allow_failures:
+        - env: PYTHON=2.6 PANDAS=0.13.1
         - env: PYTHON=2.7 PANDAS=0.12.0
         - env: PYTHON=2.7 PANDAS=0.11.0
         - env: PYTHON=2.7 PANDAS=0.10.1
+        - env: PYTHON=3.3 PANDAS=0.14.1
 
 install:
   - pip install -qq flake8
@@ -41,7 +42,7 @@ install:
   - conda create -q -n test-environment python=$PYTHON pandas=$PANDAS nose coverage setuptools html5lib lxml
   - source activate test-environment
   - pip install beautifulsoup4
-  - if [[ "$PYTHON" == "2.6" ]]; then  
+  - if [[ "$PYTHON" == "2.6" ]]; then
       pip install simplejson;
     fi
   - pip install coveralls --quiet
diff --git a/setup.py b/setup.py
index 1ca4eff0..d37abdef 100644
--- a/setup.py
+++ b/setup.py
@@ -45,12 +45,10 @@ def readme():
         'Programming Language :: Cython',
         '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.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Scientific/Engineering',
     ],
     keywords='data',