diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef49aa07..19262c36 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -71,21 +71,57 @@ jobs:
           path: test-results
 
 workflows:
-  python-3.10-community-single-3.10:
+  python-3.8-community-single-3.10:
     jobs:
       - run-tests:
-          name: python-3.10-community-single-3.10
-          python-version: "3.10.6"
+          name: python-3.8-community-single-3.10
+          python-version: "3.8.2"
           arangodb-version: "arangodb:3.10.10"
           arangodb-config: "single.conf"
           cluster: false
           enterprise: false
-  python-3.10-enterprise-cluster-3.10:
+  python-3.8-enterprise-cluster-3.10:
+    jobs:
+      - run-tests:
+          name: python-3.8-enterprise-cluster-3.10
+          python-version: "3.8.2"
+          arangodb-version: "enterprise:3.10.10"
+          arangodb-config: "cluster.conf"
+          cluster: true
+          enterprise: true
+  python-3.10-community-single-3.11:
+    jobs:
+      - run-tests:
+          name: python-3.10-community-single-3.11.4
+          python-version: "3.10.6"
+          arangodb-version: "arangodb:3.11.4"
+          arangodb-config: "single-3.11.conf"
+          cluster: false
+          enterprise: false
+  python-3.10-community-cluster-3.11:
+    jobs:
+      - run-tests:
+          name: python-3.10-community-cluster-3.11.4
+          python-version: "3.10.6"
+          arangodb-version: "arangodb:3.11.4"
+          arangodb-config: "cluster-3.11.conf"
+          cluster: true
+          enterprise: false
+  python-3.10-enterprise-single-3.11:
+    jobs:
+      - run-tests:
+          name: python-3.10-enterprise-single-3.11.4
+          python-version: "3.10.6"
+          arangodb-version: "enterprise:3.11.4"
+          arangodb-config: "single-3.11.conf"
+          cluster: false
+          enterprise: true
+  python-3.10-enterprise-cluster-3.11:
     jobs:
       - run-tests:
           name: python-3.10-enterprise-cluster-3.10
           python-version: "3.10.6"
           arangodb-version: "enterprise:3.10.10"
-          arangodb-config: "cluster.conf"
+          arangodb-config: "cluster-3.11.conf"
           cluster: true
           enterprise: true
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8e169b10..6506cf98 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -33,7 +33,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: 3.10
+          python-version: '3.10'
 
       - name: Debug with tmate
         uses: mxschmitt/action-tmate@v3
diff --git a/tests/static/cluster-3.11.conf b/tests/static/cluster-3.11.conf
new file mode 100644
index 00000000..182f3d17
--- /dev/null
+++ b/tests/static/cluster-3.11.conf
@@ -0,0 +1,13 @@
+[starter]
+mode = cluster
+local = true
+address = 0.0.0.0
+port = 8528
+
+[auth]
+jwt-secret = /tests/static/keyfile
+
+[args]
+all.database.password = passwd
+all.database.extended-names = true
+all.log.api-enabled = true
diff --git a/tests/static/cluster.conf b/tests/static/cluster.conf
index ea6f2626..573c030a 100644
--- a/tests/static/cluster.conf
+++ b/tests/static/cluster.conf
@@ -9,6 +9,4 @@ jwt-secret = /tests/static/keyfile
 
 [args]
 all.database.password = passwd
-# Extended names can be used starting with 3.11
-# all.database.extended-names = true
 all.log.api-enabled = true
diff --git a/tests/static/single-3.11.conf b/tests/static/single-3.11.conf
new file mode 100644
index 00000000..e880f9d5
--- /dev/null
+++ b/tests/static/single-3.11.conf
@@ -0,0 +1,11 @@
+[starter]
+mode = single
+address = 0.0.0.0
+port = 8528
+
+[auth]
+jwt-secret = /tests/static/keyfile
+
+[args]
+all.database.password = passwd
+all.database.extended-names = true
diff --git a/tests/static/single.conf b/tests/static/single.conf
index db6022af..c982303b 100644
--- a/tests/static/single.conf
+++ b/tests/static/single.conf
@@ -8,5 +8,3 @@ jwt-secret = /tests/static/keyfile
 
 [args]
 all.database.password = passwd
-# Extended names can be used starting with 3.11
-# all.database.extended-names = true