diff --git a/.coveragerc_py37 b/.coveragerc_py37
new file mode 100644
index 0000000..96bb72b
--- /dev/null
+++ b/.coveragerc_py37
@@ -0,0 +1,20 @@
+[run]
+branch = True
+timid = True
+
+[report]
+exclude_lines =
+    pragma: no cover
+    pragma: py3 no cover
+    if six.PY2
+    elif six.PY2
+
+partial_branches =
+    pragma: no cover
+    pragma: py3 no cover
+    if six.PY3
+    elif six.PY3
+
+show_missing = True
+
+fail_under = 90
diff --git a/buildspec-release.yml b/buildspec-release.yml
index 70bd26b..18474a1 100644
--- a/buildspec-release.yml
+++ b/buildspec-release.yml
@@ -17,7 +17,7 @@ phases:
       - tox -e black-check
 
       # run unit tests
-      - tox -e py36,py27 -- test/unit
+      - tox -e py27,py36,py37 --parallel all -- test/unit
 
       # build dummy container
       - python3 setup.py sdist
@@ -32,7 +32,7 @@ phases:
       - cd ../..
 
       # run local integration tests
-      - IGNORE_COVERAGE=- tox -e py36,py27 -- test/integration/local
+      - IGNORE_COVERAGE=- tox -e py27,py36,py37 -- test/integration/local
 
       # publish the release to github
       - git-release --publish
diff --git a/buildspec.yml b/buildspec.yml
index 12121b1..8f8ea69 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -15,7 +15,7 @@ phases:
       - tox -e twine
 
       # run unit tests
-      - tox -e py36,py27 -- test/unit
+      - tox -e py27,py36,py37 --parallel all -- test/unit
 
       # build dummy container
       - python setup.py sdist
@@ -30,4 +30,4 @@ phases:
       - cd ../..
 
       # run local integration tests
-      - IGNORE_COVERAGE=- tox -e py36,py27 -- test/integration/local
+      - IGNORE_COVERAGE=- tox -e py27,py36,py37 -- test/integration/local
diff --git a/setup.py b/setup.py
index 603bc8f..915d50d 100644
--- a/setup.py
+++ b/setup.py
@@ -58,6 +58,7 @@ def read_version():
         "Programming Language :: Python",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
     ],
     install_requires=required_packages,
     extras_require={
diff --git a/tox.ini b/tox.ini
index 2af0791..df1932c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@
 # and then run "tox" from this directory.
 
 [tox]
-envlist = black-format,flake8,pylint,twine,py27,py36
+envlist = black-format,flake8,pylint,twine,py27,py36,py37
 
 skip_missing_interpreters = False