diff --git a/.github/common.env b/.github/common.env
index cd28768..81ae8ee 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,6 +1,6 @@
 # Shared common variables
 
 CI_IMAGE_VERSION=master-241289109
-CI_TOXENV_MAIN=py36,py37,py38-nocover
-CI_TOXENV_PLUGINS=py36-plugins,py37-plugins,py38-plugins-nocover
+CI_TOXENV_MAIN=py36,py37,py38-nocover,py39-nocover
+CI_TOXENV_PLUGINS=py36-plugins,py37-plugins,py38-plugins-nocover,py39-plugins-nocover
 CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}"
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index 614a79c..2ef1a24 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -22,13 +22,13 @@
 
 services:
 
-  fedora-31:
-    <<: *tests-template
-    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${CI_IMAGE_VERSION:-latest}
-
   fedora-32:
     <<: *tests-template
 
+  fedora-33:
+    <<: *tests-template
+    image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:33-${CI_IMAGE_VERSION:-latest}
+
   debian-10:
     <<: *tests-template
     image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${CI_IMAGE_VERSION:-latest}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5dc2bba..d9401b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -45,8 +45,8 @@
         # "../compose/ci.docker-compose.yml"
         test-name:
           - debian-10
-          - fedora-31
           - fedora-32
+          - fedora-33
           - ubuntu-18.04
           - centos-7.7.1908
           - fedora-missing-deps