diff --git a/.travis.yml b/.travis.yml
index 7a21950c..e5f6acb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,19 +2,25 @@ sudo: required
 
 language: python
 
-python:
-- 2.6
-- 2.7
-- 3.4
-- 3.5
-- 3.6
-
-# Python 3.7 requires 16.04 (Xenial), this is a hack to get that specific
-# distro running that version until I can swap the rest over officially
+dist: xenial
+
 matrix:
   include:
+  - python: 2.6
+    dist: trusty
+  - python: 2.7
+  - python: 3.4
+    dist: trusty
+  - python: 3.5
+    dist: trusty
+  - python: 3.6
   - python: 3.7
-    dist: xenial
+  - python: 3.8-dev
+
+  # 3.8 is still a beta and I'm running it to see if anything breaks but
+  # don't want it to stop the build
+  allow_failures:
+  - python: 3.8-dev
 
 services:
 - docker
@@ -30,14 +36,14 @@ env:
 install:
 - docker run -d -p $SMB_PORT:445 -v $(pwd)/build-scripts:/app -w /app -e SMB_USER=$SMB_USER -e SMB_PASSWORD=$SMB_PASSWORD -e SMB_SHARE=$SMB_SHARE centos:7 /bin/bash /app/setup_samba.sh;
 - pip install --upgrade pip setuptools
-- pip install .
 - pip install -r requirements-test.txt
+- pip install .
 - pip install coveralls
 # make sure the Samba service on the container is up and running
 - python ./build-scripts/check_samba.py
 
 script:
-- py.test -v --instafail --pep8 --cov smbprotocol --cov-report term-missing
+- py.test -v --pep8 --cov smbprotocol --cov-report term-missing
 
 after_success:
 - coveralls
diff --git a/appveyor.yml b/appveyor.yml
index 5ca57a33..5e4e48b8 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -42,10 +42,10 @@ init:
 install:
 - cmd: python -m pip install --upgrade pip
 - cmd: pip install --upgrade setuptools
-- cmd: pip install .
 - cmd: pip install -r requirements-test.txt
+- cmd: pip install .
 
 build: off  # Do not run MSBuild, build stuff at install step
 
 test_script:
-- cmd: py.test -v --instafail --pep8 --cov smbprotocol --cov-report term-missing
+- cmd: py.test -v --pep8 --cov smbprotocol --cov-report term-missing
diff --git a/requirements-test.txt b/requirements-test.txt
index 425931ef..61f19cb9 100644
--- a/requirements-test.txt
+++ b/requirements-test.txt
@@ -1,4 +1,6 @@
-pytest<=3.2.5
+cryptography<2.2; python_version<"2.7"
+idna<2.8; python_version<"2.7"
+pytest==3.2.5; python_version<"2.7"
+pytest>=3.6; python_version>"2.7"
 pytest-cov
-pytest-pep8
-pytest-instafail
\ No newline at end of file
+pytest-pep8
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 9d828373..cc55efdc 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -2,6 +2,7 @@
 universal = 1
 
 [tool:pytest]
+pep8maxlinelength = 119
 pep8ignore = setup.py E501
 
 [metadata]