diff --git a/.travis.yml b/.travis.yml
index ac14b6f..493b006 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ python:
 - 2.7
 - 3.4
 - 3.5
-- &mainstream_python 3.6
-- pypy
+- 3.6
+- &mainstream_python 3.7-dev
+- &pypy pypy
 - pypy3.5
-- 3.7-dev
 install:
 - &upgrade_python_toolset pip install --upgrade pip setuptools wheel
 - pip install tox-travis
@@ -21,7 +21,7 @@ jobs:
   fast_finish: true
   include:
   - stage: Static analisys
-    python: *mainstream_python
+    python: 3.6
     services: skip
     install:
     - *upgrade_python_toolset
@@ -43,7 +43,7 @@ jobs:
   - stage: deploy
     # This prevents job from appearing in test plan unless commit is tagged:
     if: tag IS present
-    python: *mainstream_python
+    python: *pypy
     services:
     - docker
     install:
@@ -52,6 +52,7 @@ jobs:
     - ./tools/run_docker.sh "logwrap"
     before_deploy:
     - pip install -r build_requirements.txt
+    - python setup.py bdist_wheel
     deploy:
     - provider: pypi
       # `skip_cleanup: true` is required to preserve binary wheels, built
diff --git a/requirements.txt b/requirements.txt
index b273544..f4e03a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 six >=1.9
-typing >= 3.6 ; python_version < "3.7"
+typing >= 3.6 ; python_version < "3.8"
diff --git a/tools/build-wheels.sh b/tools/build-wheels.sh
index 53a19a5..032245f 100755
--- a/tools/build-wheels.sh
+++ b/tools/build-wheels.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m"
+PYTHON_VERSIONS="cp34-cp34m cp35-cp35m cp36-cp36m cp37-cp37m"
 
 # Avoid creation of __pycache__/*.py[c|o]
 export PYTHONDONTWRITEBYTECODE=1
diff --git a/tox.ini b/tox.ini
index 51d2562..615f767 100644
--- a/tox.ini
+++ b/tox.ini
@@ -79,14 +79,12 @@ usedevelop = False
 commands = pip install ./ -vvv -U
 
 [testenv:pylint]
-basepython = python3.6
 deps =
     pylint
     -r{toxinidir}/CI_REQUIREMENTS.txt
 commands = pylint logwrap
 
 [flake8]
-basepython = python3.6
 exclude =
     .venv,
     .git,