diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5cd1a972..66c2b2c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,5 +1,10 @@
 version: 2.1
 
+parameters:
+  preview:
+    type: boolean
+    default: false
+
 jobs:
   run-tests:
     resource_class: medium
@@ -77,7 +82,7 @@ workflows:
           name: python-3.8-community-single-3.10
           python-version: "3.8.2"
           arangodb-version: "arangodb:3.10.10"
-          arangodb-config: "single.conf"
+          arangodb-config: "single-3.10.conf"
           cluster: false
           enterprise: false
   python-3.8-enterprise-cluster-3.10:
@@ -86,7 +91,7 @@ workflows:
           name: python-3.8-enterprise-cluster-3.10
           python-version: "3.8.2"
           arangodb-version: "enterprise:3.10.10"
-          arangodb-config: "cluster.conf"
+          arangodb-config: "cluster-3.10.conf"
           cluster: true
           enterprise: true
   python-3.10-community-single-3.11:
@@ -95,7 +100,7 @@ workflows:
           name: python-3.10-community-single-3.11
           python-version: "3.10.6"
           arangodb-version: "arangodb:3.11.4"
-          arangodb-config: "single-3.11.conf"
+          arangodb-config: "single.conf"
           cluster: false
           enterprise: false
   python-3.10-community-cluster-3.11:
@@ -104,7 +109,7 @@ workflows:
           name: python-3.10-community-cluster-3.11
           python-version: "3.10.6"
           arangodb-version: "arangodb:3.11.4"
-          arangodb-config: "cluster-3.11.conf"
+          arangodb-config: "cluster.conf"
           cluster: true
           enterprise: false
   python-3.10-enterprise-single-3.11:
@@ -113,7 +118,7 @@ workflows:
           name: python-3.10-enterprise-single-3.11
           python-version: "3.10.6"
           arangodb-version: "enterprise:3.11.4"
-          arangodb-config: "single-3.11.conf"
+          arangodb-config: "single.conf"
           cluster: false
           enterprise: true
   python-3.10-enterprise-cluster-3.11:
@@ -122,15 +127,26 @@ workflows:
           name: python-3.10-enterprise-cluster-3.11
           python-version: "3.10.6"
           arangodb-version: "enterprise:3.11.4"
-          arangodb-config: "cluster-3.11.conf"
+          arangodb-config: "cluster.conf"
           cluster: true
           enterprise: true
+  python-latest-enterprise-single-preview:
+    jobs:
+      - when: << pipeline.parameters.preview >>
+      - run-tests:
+          name: python-latest-enterprise-single-preview
+          python-version: "latest"
+          arangodb-version: "enterprise-preview:latest"
+          arangodb-config: "single.conf"
+          cluster: false
+          enterprise: true
   python-latest-enterprise-cluster-preview:
     jobs:
+      - when: << pipeline.parameters.preview >>
       - run-tests:
           name: python-latest-enterprise-cluster-preview
           python-version: "latest"
           arangodb-version: "enterprise-preview:latest"
-          arangodb-config: "cluster-3.11.conf"
+          arangodb-config: "cluster.conf"
           cluster: true
           enterprise: true
diff --git a/tests/static/cluster-3.11.conf b/tests/static/cluster-3.10.conf
similarity index 83%
rename from tests/static/cluster-3.11.conf
rename to tests/static/cluster-3.10.conf
index 182f3d17..573c030a 100644
--- a/tests/static/cluster-3.11.conf
+++ b/tests/static/cluster-3.10.conf
@@ -9,5 +9,4 @@ 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 573c030a..182f3d17 100644
--- a/tests/static/cluster.conf
+++ b/tests/static/cluster.conf
@@ -9,4 +9,5 @@ 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/single-3.11.conf b/tests/static/single-3.10.conf
similarity index 79%
rename from tests/static/single-3.11.conf
rename to tests/static/single-3.10.conf
index e880f9d5..c982303b 100644
--- a/tests/static/single-3.11.conf
+++ b/tests/static/single-3.10.conf
@@ -8,4 +8,3 @@ 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 c982303b..e880f9d5 100644
--- a/tests/static/single.conf
+++ b/tests/static/single.conf
@@ -8,3 +8,4 @@ jwt-secret = /tests/static/keyfile
 
 [args]
 all.database.password = passwd
+all.database.extended-names = true