diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08f8c42c3..906b1c0dc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -13,7 +13,7 @@ jobs:
         command: sudo pip install --upgrade tox==2.1.1 virtualenv==16.2.0
     - run:
         name: unit tests
-        command: tox -e py27,py36,py37 -- tests/unit
+        command: tox -e py27,py37 -- tests/unit
 
   build-osx-binary:
     macos:
diff --git a/Dockerfile b/Dockerfile
index c5e7c815a..d3edfcbeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM docker:18.06.1 as docker
-FROM python:3.6
+FROM python:3.7.2-stretch
 
 RUN set -ex; \
     apt-get update -qq; \
@@ -33,4 +33,4 @@ RUN tox --notest
 ADD . /code/
 RUN chown -R user /code/
 
-ENTRYPOINT ["/code/.tox/py36/bin/docker-compose"]
+ENTRYPOINT ["/code/.tox/py37/bin/docker-compose"]
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index ee2ce8941..9c02dbc76 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,4 @@
-FROM python:3.6
+FROM python:3.7.2-stretch
 
 RUN set -ex; \
     apt-get update -qq; \
@@ -36,4 +36,4 @@ RUN tox --notest
 ADD . /code/
 RUN chown -R user /code/
 
-ENTRYPOINT ["/code/.tox/py36/bin/docker-compose"]
+ENTRYPOINT ["/code/.tox/py37/bin/docker-compose"]
diff --git a/Jenkinsfile b/Jenkinsfile
index 04f5cfbda..a19e82273 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ def runTests = { Map settings ->
   def pythonVersions = settings.get("pythonVersions", null)
 
   if (!pythonVersions) {
-    throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py36')`")
+    throw new Exception("Need Python versions to test. e.g.: `runTests(pythonVersions: 'py27,py37')`")
   }
   if (!dockerVersions) {
     throw new Exception("Need Docker versions to test. e.g.: `runTests(dockerVersions: 'all')`")
@@ -77,7 +77,6 @@ def docker_versions = get_versions(2)
 for (int i = 0; i < docker_versions.length; i++) {
   def dockerVersion = docker_versions[i]
   testMatrix["${dockerVersion}_py27"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py27"])
-  testMatrix["${dockerVersion}_py36"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py36"])
   testMatrix["${dockerVersion}_py37"] = runTests([dockerVersions: dockerVersion, pythonVersions: "py37"])
 }
 
diff --git a/appveyor.yml b/appveyor.yml
index da80d01d9..98a128a8a 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -2,7 +2,7 @@
 version: '{branch}-{build}'
 
 install:
-  - "SET PATH=C:\\Python36-x64;C:\\Python36-x64\\Scripts;%PATH%"
+  - "SET PATH=C:\\Python37-x64;C:\\Python37-x64\\Scripts;%PATH%"
   - "python --version"
   - "pip install tox==2.9.1 virtualenv==15.1.0"
 
@@ -10,7 +10,7 @@ install:
 build: false
 
 test_script:
-  - "tox -e py27,py36,py37 -- tests/unit"
+  - "tox -e py27,py37 -- tests/unit"
   - ps: ".\\script\\build\\windows.ps1"
 
 artifacts:
diff --git a/requirements-build.txt b/requirements-build.txt
index e5a77e794..9161fadf9 100644
--- a/requirements-build.txt
+++ b/requirements-build.txt
@@ -1 +1 @@
-pyinstaller==3.3.1
+pyinstaller==3.4
diff --git a/script/build/linux-entrypoint b/script/build/linux-entrypoint
index 0e3c7ec1e..34c16ac69 100755
--- a/script/build/linux-entrypoint
+++ b/script/build/linux-entrypoint
@@ -3,7 +3,7 @@
 set -ex
 
 TARGET=dist/docker-compose-$(uname -s)-$(uname -m)
-VENV=/code/.tox/py36
+VENV=/code/.tox/py37
 
 mkdir -p `pwd`/dist
 chmod 777 `pwd`/dist
diff --git a/script/build/windows.ps1 b/script/build/windows.ps1
index 41dc51e31..14c75762b 100644
--- a/script/build/windows.ps1
+++ b/script/build/windows.ps1
@@ -6,11 +6,11 @@
 #
 #        http://git-scm.com/download/win
 #
-# 2. Install Python 3.6.4:
+# 2. Install Python 3.7.2:
 #
 #        https://www.python.org/downloads/
 #
-# 3. Append ";C:\Python36;C:\Python36\Scripts" to the "Path" environment variable:
+# 3. Append ";C:\Python37;C:\Python37\Scripts" to the "Path" environment variable:
 #
 #        https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/sysdm_advancd_environmnt_addchange_variable.mspx?mfr=true
 #
diff --git a/script/setup/osx b/script/setup/osx
index b0c34e5bf..ff460d392 100755
--- a/script/setup/osx
+++ b/script/setup/osx
@@ -17,9 +17,9 @@ OPENSSL_VERSION=1.1.1a
 OPENSSL_URL=https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz
 OPENSSL_SHA1=8fae27b4f34445a5500c9dc50ae66b4d6472ce29
 
-PYTHON_VERSION=3.6.8
+PYTHON_VERSION=3.7.2
 PYTHON_URL=https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tgz
-PYTHON_SHA1=09fcc4edaef0915b4dedbfb462f1cd15f82d3a6f
+PYTHON_SHA1=0cd8e52d8ed1d0be12ac8e87a623a15df3a3b418
 
 #
 # Install prerequisites.
diff --git a/script/test/all b/script/test/all
index e48f73bba..5c911bba4 100755
--- a/script/test/all
+++ b/script/test/all
@@ -24,7 +24,7 @@ fi
 
 
 BUILD_NUMBER=${BUILD_NUMBER-$USER}
-PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py36}
+PY_TEST_VERSIONS=${PY_TEST_VERSIONS:-py27,py37}
 
 for version in $DOCKER_VERSIONS; do
   >&2 echo "Running tests against Docker $version"
diff --git a/tox.ini b/tox.ini
index 08efd4e68..57e57bc63 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,py37,pre-commit
+envlist = py27,py37,pre-commit
 
 [testenv]
 usedevelop=True