diff --git a/.travis.yml b/.travis.yml
index c793c1f..3286429 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,7 @@ python:
   - "3.6"
   - "3.7"
   - "3.8"
+  - "3.9"
   - "pypy"
 script: python setup.py test
 deploy:
@@ -13,6 +14,8 @@ deploy:
   provider: pypi
   user: __token__
   distributions: sdist bdist_wheel
+  skip_existing: true
   on:
     tags: true
     repo: zapier/email-reply-parser
+    python: 3.9
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 7ae61d1..66c5469 100644
--- a/setup.py
+++ b/setup.py
@@ -35,5 +35,6 @@
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
     ]
 )
\ No newline at end of file
diff --git a/tox.ini b/tox.ini
new file mode 100644
index 0000000..5b449e8
--- /dev/null
+++ b/tox.ini
@@ -0,0 +1,6 @@
+[tox]
+envlist = py27, py34, py35, py36, py37, py38, py39, pypy
+
+[testenv]
+commands =
+    python setup.py test
\ No newline at end of file