diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 28771216c..4a9952c47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,19 +2,77 @@ name: Run test suite
 on: [push, pull_request]
 
 jobs:
-  test-windows:
-    name: "Windows Tests"
+  build:
+    name: Build
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest]
-        python-version: [3.7, 3.8]
-        env: [TOXENV: py]
         include:
-        - os: windows-latest
-          python-version: 3.6
+        # non-testing jobs
+        - os: ubuntu-18.04
+          python-version: 3.8
           env:
-            TOXENV: windows-pinned
+            TOXENV: security
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: flake8
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: pylint
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: typing
+        - os: ubuntu-18.04
+          python-version: 3.7  # Keep in sync with .readthedocs.yml
+          env:
+            TOXENV: docs
+
+        # tests
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: py
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: py
+
+        # windows tests
+        - os: windows-latest
+          python-version: 3.7
+          env:
+            TOXENV: py
+        - os: windows-latest
+          python-version: 3.8
+          env:
+            TOXENV: py
+
+        # pinned deps
+        - os: ubuntu-18.04
+          python-version: 3.6.1
+          env:
+            TOXENV: pinned
+        - os: ubuntu-18.04
+          python-version: 3.6.1
+          env:
+            TOXENV: asyncio-pinned
+        # - os: windows-latest
+        #   python-version: 3.6
+        #   env:
+        #     TOXENV: windows-pinned
+
+        # extras
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: extra-deps
+        - os: ubuntu-18.04
+          python-version: 3.8
+          env:
+            TOXENV: asyncio
 
     steps:
     - uses: actions/checkout@v2
diff --git a/.travis.yml b/.travis.yml
index b883c5b78..a973fcd8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,39 +7,15 @@ branches:
     - /^\d\.\d+\.\d+(rc\d+|\.dev\d+)?$/
 matrix:
   include:
-    - env: TOXENV=security
-      python: 3.8
-    - env: TOXENV=flake8
-      python: 3.8
-    - env: TOXENV=pylint
-      python: 3.8
-    - env: TOXENV=docs
-      python: 3.7  # Keep in sync with .readthedocs.yml
-    - env: TOXENV=typing
-      python: 3.8
 
-    - env: TOXENV=pinned
-      python: 3.6.1
-    - env: TOXENV=asyncio-pinned
-      python: 3.6.1
     - env: TOXENV=pypy3-pinned PYPY_VERSION=3.6-v7.2.0
 
-    - env: TOXENV=py
-      python: 3.6
     - env: TOXENV=pypy3 PYPY_VERSION=3.6-v7.3.1
 
-    - env: TOXENV=py
-      python: 3.7
-
     - env: TOXENV=py PYPI_RELEASE_JOB=true
       python: 3.8
       dist: bionic
-    - env: TOXENV=extra-deps
-      python: 3.8
-      dist: bionic
-    - env: TOXENV=asyncio
-      python: 3.8
-      dist: bionic
+
 install:
   - |
       if [[ ! -z "$PYPY_VERSION" ]]; then