diff --git a/.github/workflows/bleeding-edge.yml b/.github/workflows/bleeding-edge.yml
index 56bc17fa..b6e85930 100644
--- a/.github/workflows/bleeding-edge.yml
+++ b/.github/workflows/bleeding-edge.yml
@@ -13,14 +13,13 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
-        toolkit: ['null', 'pyside6', 'wx']
-        python-version: ['3.10']
-        exclude:
-          # No Wx wheels available for ubuntu or macos
-          - os: 'ubuntu-latest'
-            toolkit: 'wx'
-          - os: 'macos-latest'
+        toolkit: ['null', 'pyside6']
+        python-version: ['3.11']
+        include:
+          # No Wx wheels available for Python 3.11, so test on 3.10
+          - os: 'windows-latest'
             toolkit: 'wx'
+            python-version: '3.10'
     runs-on: ${{ matrix.os }}
     steps:
       - name: Check out
diff --git a/.github/workflows/test-with-pip.yml b/.github/workflows/test-with-pip.yml
index 3282af89..433c4fb9 100644
--- a/.github/workflows/test-with-pip.yml
+++ b/.github/workflows/test-with-pip.yml
@@ -14,8 +14,17 @@ jobs:
       matrix:
         os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
         toolkit: ['null', 'pyside2', 'pyside6', 'pyqt5', 'wx']
-        python-version: ['3.8', '3.10']
+        python-version: ['3.8', '3.10', '3.11']
         exclude:
+          # No Wx wheels available for Python 3.11
+          - toolkit: 'wx'
+            python-version: '3.11'
+          # No PySide2 wheels available for Python 3.11
+          - toolkit: 'pyside2'
+            python-version: '3.11'
+          # No PyQt5 wheels available for Python 3.11
+          - toolkit: 'pyqt5'
+            python-version: '3.11'
           # No Wx wheels available for ubuntu or macos
           - os: 'ubuntu-latest'
             toolkit: 'wx'
@@ -50,11 +59,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip wheel
       - name: Install local packages
-        run: pip install ".[cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]"
-      - name: Install celiagg manually
-        # This is needed until new release of celiagg
-        # - numpy is needed for install in current released version
-        run: pip install celiagg
+        run: pip install ".[celiagg,cairo,layout,pdf,svg,test,${{ matrix.toolkit }}]"
       - name: Sanity check package version
         run: pip list
       - name: Run kiva test suite (Linux)