diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1f08ce8..120db7e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.5, 3.6, 3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
@@ -22,11 +22,16 @@ jobs:
         pip install flake8
         if [ -f test-requirements.txt ]; then pip install -r test-requirements.txt; fi
     - name: Lint with flake8
+      env:
+        PYTHON_VERSION: ${{ matrix.python-version }}
       run: |
+        if [ "$PYTHON_VERSION" = "3.8" ] || [ "$PYTHON_VERSION" = "3.9" ]; then
+          exit 0
+        fi
         # stop the build if there are Python syntax errors or undefined names
-        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        flake8 bb_pytest *.py --count --select=E9,F63,F7,F82 --show-source --statistics
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
-        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+        flake8 bb_pytest *.py --exit-zero --max-complexity=10 --max-line-length=127 --statistics
     - name: Test with pytest
       run: |
         pytest
diff --git a/test-requirements.txt b/test-requirements.txt
index a2c1ba6..57f894d 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,3 @@
-buildbot[test] --no-binary buildbot  # buildbot wheel dist excludes test modules
-pytest
+buildbot[test]==2.9.0 --no-binary buildbot  # buildbot wheel dist excludes test modules
+pytest==6.1.2
 flake8