diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2c79d5810..0cf216768 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,16 @@ jobs:
         os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: [3.7, 3.8]
         browser: [chromium, firefox, webkit]
+        include:
+        - os: ubuntu-latest
+          python-version: 3.9
+          browser: chromium
+        - os: windows-latest
+          python-version: 3.9
+          browser: chromium
+        - os: macos-latest
+          python-version: 3.9
+          browser: chromium
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
@@ -63,7 +73,7 @@ jobs:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python -m pip install --upgrade pip
+        python -m pip install --upgrade pip wheel
         pip install -r local-requirements.txt
         pip install -e .
     - name: Build driver
diff --git a/setup.py b/setup.py
index e73fb74c5..f7be1fb4c 100644
--- a/setup.py
+++ b/setup.py
@@ -35,6 +35,7 @@
         "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],