diff --git a/.travis.yml b/.travis.yml
index 3261764..cb0fdb9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,30 +3,15 @@ language: python
 services:
   - docker
 
-jobs:
-  include:
-  ### E2E tests with PowerDNS v4.1.10
-  - name: "PowerDNS 4.1.10, python 3.5"
-    python: "3.5"
-    env:
-      - POWERDNS_VERSION="4.1.10"
-  - name: "PowerDNS 4.1.10, python 3.7"
-    python: "3.7"
-    env:
-      - POWERDNS_VERSION="4.1.10"
-  ### E2E tests with PowerDNS v4.2.0
-  - name: "PowerDNS 4.2.0, python 3.5"
-    python: "3.5"
-    env:
-      - POWERDNS_VERSION="v4.2.0"
-  - name: "PowerDNS 4.2.0, python 3.7"
-    python: "3.7"
-    env:
-      - POWERDNS_VERSION="v4.2.0"
+env:
+- POWERDNS_VERSION="4.1.10"
+- POWERDNS_VERSION="v4.2.0"
 
 # uses default POWERDNS_VERSION in docker-compose.yml
 python:
   # PyPy versions
+  - "3.5"
+  - "3.7"
   - "pypy3.5"
 
 install:
@@ -45,13 +30,15 @@ script:
 after_script:
   - COMPOSE_PROJECT_NAME="certbotpdns_$TRAVIS_JOB_ID" docker-compose down
 
-deploy:
-  provider: pypi
-  user: $PYPI_USERNAME
-  password: $PYPI_PASSWORD
-  on:
-      tags: true
-      python: "3.6"
+jobs:
+  include:
+    - stage: deploy
+      script: skip
+      deploy:
+        provider: pypi
+        user: $PYPI_USERNAME
+        password: $PYPI_PASSWORD
+      if: tag =~ ^[0-9]+\.[0-9]+\.[0-9]+ # match semver
 
 after_success:
   - coveralls