diff --git a/.travis.yml b/.travis.yml
index d2d9e30e..50390039 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,3 +23,30 @@ script:
 
 after_script:
   - python debug-info.py
+
+deploy:
+  - provider: pypi
+    server: https://test.pypi.org/legacy/
+    on:
+      tags: false
+      repo: html5lib/html5lib-python
+      branch: master
+      python: "3.6"
+      condition: "$TOXENV = base"
+    user: __token__
+    password:
+      secure: "TODO"
+    distributions: sdist --format=gztar bdist_wheel
+    skip_existing: true
+  - provider: pypi
+    on:
+      tags: true
+      repo: html5lib/html5lib-python
+      branch: master
+      python: "3.6"
+      condition: "$TOXENV = base"
+    user: __token__
+    password:
+      secure: "TODO"
+    distributions: sdist --format=gztar bdist_wheel
+    skip_existing: true