diff --git a/.travis.yml b/.travis.yml
index 3b0d366..c241520 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,13 +3,30 @@ dist: xenial
 language: python
 python: "3.7"
 
-before_install:
-  - pip install pylint coverage mypy lxml
-  - pip install -e .
-  - mypy . --txt-report . --scripts-are-modules; cat index.txt; rm index.txt
+jobs:
+  include:
+  - stage: code quality
+    name: "mypy"
+    before_install:
+    - pip install mypy lxml
+    - pip install -e .
 
-script:
-  - HOME=/tmp coverage run --source=aioupnp -m unittest -v
+    script:
+    - mypy . --txt-report . --scripts-are-modules; cat index.txt; rm index.txt
 
-after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - &tests
+      stage: test
+      name: "Unit Tests w/ Python 3.7"
+      before_install:
+      - pip install pylint coverage
+      - pip install -e .
+
+      script:
+      - HOME=/tmp coverage run --source=aioupnp -m unittest -v
+
+      after_success:
+      - bash <(curl -s https://codecov.io/bash)
+
+  - <<: *tests
+    name: "Unit Tests w/ Python 3.6"
+    python: "3.6"