diff --git a/.travis.yml b/.travis.yml
index 10ffbba..1a19129 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,52 +17,43 @@ env:
   matrix:
     - GDALVERSION="2.0.1"
     - GDALVERSION="2.1.3"
-    - GDALVERSION="2.2.2"
-    - GDALVERSION="trunk"
-
-matrix:
-  allow_failures:
-    - env: GDALVERSION="trunk"
-
+    - GDALVERSION="2.2.0"
 addons:
   apt:
     packages:
     - gdal-bin
     - libproj-dev
     - libhdf5-serial-dev
+    - libpng12-dev
     - libgdal-dev
     - libatlas-dev
     - libatlas-base-dev
     - gfortran
-
 python:
   - "2.7"
   - "3.4"
   - "3.5"
   - "3.6"
-
 before_install:
-  - pip install -U pip wheel coveralls
-  - pip install setuptools==36.0.1
+  - "pip install -U pip wheel coveralls"
   - . ./scripts/travis_gdal_install.sh
   - export PATH=$GDALINST/gdal-$GDALVERSION/bin:$PATH
   - export LD_LIBRARY_PATH=$GDALINST/gdal-$GDALVERSION/lib:$LD_LIBRARY_PATH
   - export GDAL_DATA=$GDALINST/gdal-$GDALVERSION/share/gdal
   - export PROJ_LIB=/usr/share/proj
+  - "whereis gdal"
+  - export CPLUS_INCLUDE_PATH=/usr/include/gdal
+  - export C_INCLUDE_PATH=/usr/include/gdal
   - gdal-config --version
-  - pip list -l
-
+  - "pip list -l"
 install:
-  - if [ "$GDALVERSION" == "trunk" ]; then echo "Using gdal trunk"; elif [ $(gdal-config --version) == "$GDALVERSION" ]; then echo "Using gdal $GDALVERSION"; else echo "NOT using gdal $GDALVERSION as expected; aborting"; exit 1; fi
-  - pip install --upgrade --force-reinstall --global-option=build_ext --global-option='-I$GDALINST/gdal-$GDALVERSION/include' --global-option='-L$GDALINST/gdal-$GDALVERSION/lib' --global-option='-R$GDALINST/gdal-$GDALVERSION/lib' -e .
-  - pip install -e .[test]
-  - gdal-config --version
-
+  - "if [ $(gdal-config --version) == \"$GDALVERSION\" ]; then echo \"Using gdal $GDALVERSION\"; else echo \"NOT using gdal $GDALVERSION as expected; aborting\"; exit 1; fi"
+  - "pip install GDAL==$GDALVERSION"
+  - "pip install -e .[test]"
+before_script:
+  - pip install flake8
+  - flake8
 script:
   - pytest
-
 after_success:
-  - coveralls || echo "!! intermittent coveralls failure"
-
-before_cache:
-  - if [ "$GDALVERSION" = "trunk" ]; then rm -rf $GDALINST/gdal-$GDALVERSION; fi
+  - coveralls