diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d884ca1f..e6e5bb62 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,26 +1,41 @@
-name: test
-
-on: [push, pull_request]
-
-jobs:
-
-  test:
-    runs-on: ${{ matrix.os }}
-    name: ${{ matrix.os }} - py${{ matrix.python-version }}
-    strategy:
-      matrix:
-        os: [windows-latest]
-        python-version: [3.6, 3.7, 3.8, 3.9]
-    steps:
-    - uses: actions/checkout@v2
-    - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
-      with:
-        python-version: ${{ matrix.python-version }}
-    - name: Install
-      run: |
-        pip install --upgrade pip setuptools
-        pip install -e .
-    - name: Run Tests
-      run: |
-        python runtests.py
+name: test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+
+  test:
+    runs-on: ${{ matrix.os }}
+    name: ${{ matrix.os }} - ${{ matrix.python }}
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+        python: [3.9]
+        include:
+          - os: ubuntu-latest
+            python: 3.6
+          - os: ubuntu-latest
+            python: 3.9
+          - os: ubuntu-latest
+            python: pypy3
+          - os: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python ${{ matrix.python }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python }}
+    - name: Install
+      # pyperformance must be installed:
+      # pyperformance/tests/test_compare.py imports it
+      run: |
+        python -m pip install --upgrade pip setuptools
+        python -m pip install -e .
+    - name: Display Python version
+      run: python -c "import sys; print(sys.version)"
+    - name: Run Tests
+      run: python runtests.py
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0256e44b..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: python
-dist: xenial
-cache: pip
-python:
-    # minimum required Python version
-    - 3.6
-    - 3.9
-    - nightly
-    - pypy3
-install:
-    - pip install -U 'setuptools>=18.5' 'pip>=6.0' 'wheel'
-    # Need to install pyperformance,
-    # pyperformance/tests/test_compare.py imports it
-    - pip install -e .
-script:
-    - python runtests.py