diff --git a/.travis.yml b/.travis.yml
index c4bd7405..3218e65a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,10 @@ matrix:
       env: TOXENV=py37
       dist: xenial
       sudo: true
+    - python: "3.8"
+      env: TOXENV=py38
+      dist: xenial
+      sudo: true
     - python: "3.7"
       env: TOXENV=docker
       dist: xenial
@@ -25,7 +29,7 @@ matrix:
       env: TOXENV=docs
     - python: "2.7"
       env: TOXENV=integration
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV=integration3
 install:
 - git config --global user.email "travisci@jasonantman.com"
diff --git a/CHANGES.rst b/CHANGES.rst
index 51f5cd44..f3ebe891 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -24,6 +24,7 @@ Unreleased Changes
 * `Issue #438 <https://github.com/jantman/awslimitchecker/issues/438>`_ - Per `PEP 373 <https://www.python.org/dev/peps/pep-0373/>`__, Python 2.7 will officially end support on January 1, 2020. As such, and in keeping with reasoning explained at `python3statement.org <https://python3statement.org/>`__, awslimitchecker will **stop supporting and testing against Python 2.7** on January 1, 2020. At that point, all new versions will be free to use Python features introduced in 3.5. As of this version, a `PendingDeprecationWarning <https://docs.python.org/3/library/exceptions.html#PendingDeprecationWarning>`__ will be emitted when running awslimitchecker under Python 2.7.
 * `Issue #437 <https://github.com/jantman/awslimitchecker/issues/437>`_ - Per `PEP 429 <https://www.python.org/dev/peps/pep-0429/>`_, Python 3.4 reached end-of-life on March 18, 2019 and is now officially retired. Add a ``PendingDeprecationWarning`` for users running under this version, announcing that support for Python 3.4 will be removed on January 1, 2020.
 * In following with the above two issues, raise a ``DeprecationWarning`` when running on any Python2 version prior to 2.7 or any Python3 version prior to 3.4, in accorance with the `published end-of-life dates of those versions <https://devguide.python.org/devcycle/#end-of-life-branches>`_.
+* `Issue #436 <https://github.com/jantman/awslimitchecker/issues/436>`_ - Begin testing under Python 3.8 and base our Docker image on ``python:3.8-alpine``.
 
 New EC2 vCPU Limits
 +++++++++++++++++++
diff --git a/Dockerfile b/Dockerfile
index 370e977f..fcd96da4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3-alpine
+FROM python:3.8-alpine
 
 ARG git_version
 
diff --git a/tox.ini b/tox.ini
index 88bd4090..f7bb14a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34,py35,py36,py37,pypy,pypy3,docs,localdocs,integration,integration3,docker
+envlist = py27,py34,py35,py36,py37,py38,pypy,pypy3,docs,localdocs,integration,integration3,docker
 
 [testenv]
 deps =
@@ -161,7 +161,7 @@ commands =
 deps = {[testenv:integration]deps}
 passenv = {[testenv:integration]passenv}
 setenv = {[testenv:integration]setenv}
-basepython = python3.6
+basepython = python3.7
 sitepackages = False
 whitelist_externals = env test
 commands = {[testenv:integration]commands}