diff --git a/.circleci/config.yml b/.circleci/config.yml
index 25624c5..39b327f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,13 +10,6 @@ read_cache: &read_cache
   - v1-dependencies-{{ checksum "Pipfile.lock" }}
   - v1-dependencies-
 
-install_devdeps: &install_devdeps
-  name: install dependencies
-  command: |
-    pip install pipenv
-    pipenv install --three --ignore-pipfile
-    pipenv install --three --dev --ignore-pipfile
-
 store_cache: &store_cache
   paths:
   - ./repo
@@ -34,7 +27,11 @@ jobs:
     steps:
     - checkout
     - restore_cache: *read_cache
-    - run: *install_devdeps
+    - run:
+        name: install dependencies
+        command: |
+          pipenv install --python 3.5 --ignore-pipfile
+          pipenv install --python 3.5 --dev --ignore-pipfile
     - save_cache: *store_cache
     - run: *run_tests
   py36:
@@ -44,7 +41,11 @@ jobs:
     steps:
     - checkout
     - restore_cache: *read_cache
-    - run: *install_devdeps
+    - run:
+        name: install dependencies
+        command: |
+          pipenv install --python 3.6 --ignore-pipfile
+          pipenv install --python 3.6 --dev --ignore-pipfile
     - save_cache: *store_cache
     - run: *run_tests
   py37:
@@ -54,9 +55,27 @@ jobs:
     steps:
     - checkout
     - restore_cache: *read_cache
-    - run: *install_devdeps
+    - run:
+        name: install dependencies
+        command: |
+          pipenv install --python 3.7 --ignore-pipfile
+          pipenv install --python 3.7 --dev --ignore-pipfile
     - save_cache: *store_cache
     - run: *run_tests
+  py38:
+    <<: *defaults
+    docker:
+      - image: circleci/python:3.8.0a3
+    steps:
+      - checkout
+      - restore_cache: *read_cache
+      - run:
+          name: install dependencies
+          command: |
+            pipenv install --python 3.8 --ignore-pipfile
+            pipenv install --python 3.8 --dev --ignore-pipfile
+      - save_cache: *store_cache
+      - run: *run_tests
 
   pypy35:
     docker:
@@ -87,7 +106,11 @@ jobs:
     steps:
     - checkout
     - restore_cache: *read_cache
-    - run: *install_devdeps
+    - run:
+        name: install dependencies
+        command: |
+          pipenv install --python 3.6 --ignore-pipfile
+          pipenv install --python 3.6 --dev --ignore-pipfile
     - save_cache: *store_cache
     - run:
         name: run tests
@@ -100,7 +123,11 @@ jobs:
     steps:
     - checkout
     - restore_cache: *read_cache
-    - run: *install_devdeps
+    - run:
+        name: install dependencies
+        command: |
+          pipenv install --python 3.6 --ignore-pipfile
+          pipenv install --python 3.6 --dev --ignore-pipfile
     - save_cache: *store_cache
     - run:
         name: build docs
@@ -113,6 +140,7 @@ workflows:
       - py35
       - py36
       - py37
+      - py38
       - pypy35
       - flake8
-      - docs
\ No newline at end of file
+      - docs
diff --git a/setup.py b/setup.py
index e72202e..a7fb925 100644
--- a/setup.py
+++ b/setup.py
@@ -69,6 +69,7 @@ def run(self):
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
+        'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: Implementation :: CPython',
         'Programming Language :: Python :: Implementation :: PyPy',
         'License :: OSI Approved :: MIT License',
diff --git a/tox.ini b/tox.ini
index 1b0c1d7..b725f55 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37,pypy35,flake8,docs
+envlist = py35,py36,py37,py38,pypy35,flake8,docs
 
 [testenv:flake8]
 basepython = python3.6
@@ -31,6 +31,9 @@ basepython = python3.6
 [testenv:py37]
 basepython = python3.7
 
+[testenv:py38]
+basepython = python3.8
+
 [testenv:pypy35]
 basepython = pypy3
 commands =