diff --git a/.travis.yml b/.travis.yml
index 01973ec3..afdf3fd3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,25 @@
-language: python
 dist: xenial
 sudo: required
-
-before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
+language: python
 
 stages:
   - Test
+  - name: Deploy
+    if: (repo = jtpereyda/boofuzz) AND (fork = false) AND (tag IS present)
 
 jobs:
   include:
     - stage: Test
-      install: pip install tox
-      script: tox --recreate
+      python: 2.7
+      env: TOXENV=py27-unix
+    - python: 3.6
+      env: TOXENV=py36-unix
+    - python: 3.7
+      env: TOXENV=py37-unix
+
+    - stage: Deploy
+      install: true
+      script: skip
       deploy:
         provider: pypi
         user: jtpereyda
@@ -23,3 +31,7 @@ jobs:
           tags: true
           repo: jtpereyda/boofuzz
           branch: master
+
+before_install: sudo sed -i -e 's/^Defaults\tsecure_path.*$//' /etc/sudoers
+install: pip install tox
+script: tox --skip-missing-interpreters false
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 86bfdd31..924cc583 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -18,15 +18,17 @@ See installation instructions for details on installing boofuzz from source with
 Pull Request Checklist
 ----------------------
 
-1. Verify tests pass: ::
+1. Install python version 2.7.9+ **and** 3.6+
+
+2. Verify tests pass: ::
 
       tox
 
-2. If you have PyCharm, use it to see if your changes introduce any new static analysis warnings.
+3. If you have PyCharm, use it to see if your changes introduce any new static analysis warnings.
 
-3. Modify CHANGELOG.rst to say what you changed.
+4. Modify CHANGELOG.rst to say what you changed.
 
-4. If adding a new module, consider adding it to the Sphinx docs (see ``docs`` folder).
+5. If adding a new module, consider adding it to the Sphinx docs (see ``docs`` folder).
 
 Maintainers
 ===========
diff --git a/tox.ini b/tox.ini
index 4440c7a9..a9aa1af4 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,9 @@
 [tox]
+skip_missing_interpreters = True
 envlist =
     py27-{unix,windows}
     py36-{unix,windows}
+    py37-{unix,windows}
 
 [testenv]
 whitelist_externals =