diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f2d43fb10c..4cf89be12f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -53,7 +53,9 @@ jobs:
         tox-environment:
           - backup-integration
           - charm-integration
+          - database-relation-integration
           - db-relation-integration
+          - db-admin-relation-integration
           - ha-replication-integration
           - ha-self-healing-integration
           - ha-restore-cluster-integration
@@ -62,8 +64,6 @@ jobs:
           - tls-integration
           - upgrade-integration
           - upgrade-from-stable-integration
-          - database-relation-integration
-          - db-admin-relation-integration
         juju-snap-channel:  ["2.9/stable", "3.1/stable"]
         free-disk-space:
           - false
@@ -71,11 +71,27 @@ jobs:
           - juju-snap-channel: "3.1/stable"
             agent-version: "3.1.6"
             libjuju-version:  "3.2.2"
-            exclude-mark:  "not juju2"
+            exclude-mark:  "juju2"
           - juju-snap-channel: "2.9/stable"
             agent-version: "2.9.45"
             libjuju-version:  "2.9.45.0"
-            exclude-mark:  "not juju3"
+            exclude-mark:  "juju3"
+          # Admin tests need space
+          - tox-environment: db-admin-relation-integration
+            free-disk-space: true
+          # Database relations need space
+          - tox-environment: database-relation-integration
+            free-disk-space: true
+        exclude:
+          # Admin tests need landscape on juju 2
+          - tox-environment: db-admin-relation-integration
+            juju-snap-channel: "3.1/stable"
+          # Admin tests need space
+          - tox-environment: db-admin-relation-integration
+            free-disk-space: false
+          # Database relations need space
+          - tox-environment: database-relation-integration
+            free-disk-space: false
     name: ${{ matrix.juju-snap-channel }} - (GH hosted) ${{ matrix.tox-environment }}
     needs:
       - lint