diff --git a/.coveragerc b/.coveragerc
index fb2c907..ef195b9 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -9,3 +9,4 @@ omit =
     geopandas/tests/*
     geopandas/io/tests/*
     geopandas/tools/tests/*
+    geopandas/_version.py
diff --git a/.travis.yml b/.travis.yml
index 8370a60..75dd383 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,11 +30,10 @@ matrix:
     - python: 2.7
       env: PANDAS=0.19.2  MATPLOTLIB=1.5.3
     - python: 2.7
-      env: PANDAS=0.20.2  MATPLOTLIB=1.5.3   # Make this MATPLOTLIB 2.0.x, when fixed
+      env: PANDAS=0.20.2  MATPLOTLIB=2.0.2
     - python: 2.7
       env: PANDAS=master  MATPLOTLIB=master
 
-    # Note: Python 3.6 and matplotlib versions before 1.4.3 support is hit or miss.
     - python: 3.6
       env: PANDAS=0.16.2  MATPLOTLIB=1.4.3
     - python: 3.6
@@ -44,7 +43,7 @@ matrix:
     - python: 3.6
       env: PANDAS=0.19.2  MATPLOTLIB=1.5.3
     - python: 3.6
-      env: PANDAS=0.20.2  MATPLOTLIB=1.5.3  # Make this MATPLOTLIB 2.0.x, when fixed
+      env: PANDAS=0.20.2  MATPLOTLIB=2.0.2
     - python: 3.6
       env: PANDAS=master  MATPLOTLIB=master
 
diff --git a/appveyor.yml b/appveyor.yml
index 3643c5f..e747f66 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -36,7 +36,7 @@ install:
   - conda info -a
   - "conda create -q -n test-environment python=%PYTHON_VERSION%"
   - activate test-environment
-  - conda install pandas shapely=1.5 fiona pyproj rtree matplotlib==1.5.3 descartes
+  - conda install pandas shapely=1.5 fiona pyproj rtree matplotlib descartes
   - conda install pytest mock
 
 test_script:
diff --git a/requirements.test.txt b/requirements.test.txt
index 1a2f4bb..bf7a8c0 100644
--- a/requirements.test.txt
+++ b/requirements.test.txt
@@ -8,3 +8,4 @@ pytest>=3.1.0
 pytest-cov
 codecov
 rtree>=0.8
+pysal
diff --git a/requirements.txt b/requirements.txt
index dd24eae..67d5c5c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,3 @@ shapely>=1.2.18,<1.6
 fiona>=1.0.1
 pyproj>=1.9.3
 six>=1.3.0
-# for Python 2.6 (environment marker support as of pip 6.0)
-unittest2 ; python_version < '2.7'
-ordereddict ; python_version < '2.7'