diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
index a89194c525..3aad6203e3 100644
--- a/.github/workflows/integration_test.yaml
+++ b/.github/workflows/integration_test.yaml
@@ -42,7 +42,9 @@ jobs:
               _, runner, task, variant = job.split(":")
               # Example: "test_charm.py"
               task = task.removeprefix("tests/spread/")
-              if runner.endswith("-arm"):
+              if "s390x" in runner:
+                  architecture = "s390x"
+              elif runner.endswith("-arm"):
                   architecture = "arm64"
               else:
                   architecture = "amd64"
@@ -86,8 +88,9 @@ jobs:
     runs-on: ${{ matrix.job.runner }}
     timeout-minutes: 217  # Sum of steps `timeout-minutes` + 5
     steps:
-      - name: Free up disk space
+      - name: (GitHub hosted) Free up disk space
         timeout-minutes: 1
+        if: ${{ !contains(matrix.job.runner, 'self-hosted') }}
         run: |
           printf '\nDisk usage before cleanup\n'
           df --human-readable
@@ -95,6 +98,10 @@ jobs:
           rm -r /opt/hostedtoolcache/
           printf '\nDisk usage after cleanup\n'
           df --human-readable
+      - name: (IS hosted) Disk usage
+        timeout-minutes: 1
+        if: ${{ contains(matrix.job.runner, 'self-hosted') }}
+        run: df --human-readable
       - name: Checkout
         timeout-minutes: 3
         uses: actions/checkout@v4
diff --git a/spread.yaml b/spread.yaml
index cbcc1457aa..b5aeac5d6f 100644
--- a/spread.yaml
+++ b/spread.yaml
@@ -100,6 +100,16 @@ backends:
           username: runner
           variants:
             - -juju29
+      - self-hosted-linux-s390x-noble-edge:
+          username: ubuntu
+          environment:
+            # Several python packages (e.g. cryptography, bcrypt) do not have s390x builds on PyPI,
+            # so they must be built from source. pkg-config & rust toolchain needed
+            # (These packages are being built when installing poetry or integration test Python
+            # dependencies)
+            CONCIERGE_EXTRA_DEBS: pipx,pkg-config,rustup
+          variants:
+            - -juju29
 
 suites:
   tests/spread/:
@@ -116,10 +126,18 @@ prepare: |
   snap refresh --hold
   chown -R root:root "$SPREAD_PATH"
   cd "$SPREAD_PATH"
-  snap install --classic concierge
+  # Install via snap after https://github.com/canonical/concierge/pull/81 released
+  go install github.com/canonical/concierge@latest
+
+  # Install charmcraft & pipx on lxd-vm backend and install pipx on IS-hosted runners
+  ~/go/bin/concierge prepare --trace
 
-  # Install charmcraft & pipx (on lxd-vm backend)
-  concierge prepare --trace
+  if [[ $SPREAD_SYSTEM == *"s390x"* ]]
+  then
+    rustup set profile minimal
+    # TODO add renovate comment for rust version
+    rustup default 1.88.0
+  fi
 
   pipx install tox poetry
 prepare-each: |
@@ -131,7 +149,7 @@ prepare-each: |
     poetry add --lock --group integration juju@^2
   fi
   # `concierge prepare` needs to be run for each spread job in case Juju version changed
-  concierge prepare --trace
+  ~/go/bin/concierge prepare --trace
 
   # Unable to set constraint on all models because of Juju bug:
   # https://bugs.launchpad.net/juju/+bug/2065050
diff --git a/tests/integration/backups.py b/tests/integration/backups.py
index d22077d456..2e7ac6d86c 100644
--- a/tests/integration/backups.py
+++ b/tests/integration/backups.py
@@ -21,7 +21,7 @@
 logger = logging.getLogger(__name__)
 
 S3_INTEGRATOR = "s3-integrator"
-S3_INTEGRATOR_CHANNEL = "latest/stable"
+S3_INTEGRATOR_CHANNEL = "1/edge"  # Use edge for s390x
 MYSQL_APPLICATION_NAME = "mysql"
 TIMEOUT = 10 * 60
 SERVER_CONFIG_USER = "serverconfig"
diff --git a/tests/integration/markers.py b/tests/integration/markers.py
index 81fdd46fb0..6f1767e6e6 100644
--- a/tests/integration/markers.py
+++ b/tests/integration/markers.py
@@ -18,3 +18,6 @@
 arm64_only = pytest.mark.skipif(
     architecture.architecture != "arm64", reason="Requires arm64 architecture"
 )
+s390x_only = pytest.mark.skipif(
+    architecture.architecture != "s390x", reason="Requires s390x architecture"
+)
diff --git a/tests/integration/test_architecture.py b/tests/integration/test_architecture.py
index efafa38e23..4964ebb302 100644
--- a/tests/integration/test_architecture.py
+++ b/tests/integration/test_architecture.py
@@ -49,4 +49,21 @@ async def test_amd_charm_on_arm_host(ops_test: OpsTest) -> None:
     )
 
 
-# TODO: add s390x test
+@markers.s390x_only
+async def test_amd_charm_on_s390x_host(ops_test: OpsTest) -> None:
+    """Tries deploying an amd64 charm on s390x host."""
+    charm = "./mysql_ubuntu@22.04-amd64.charm"
+
+    await ops_test.model.deploy(
+        charm,
+        application_name=MYSQL_APP_NAME,
+        num_units=1,
+        config={"profile": "testing"},
+        base="ubuntu@22.04",
+    )
+
+    await ops_test.model.wait_for_idle(
+        apps=[MYSQL_APP_NAME],
+        status="error",
+        raise_on_error=False,
+    )
diff --git a/tests/integration/test_backup_aws.py b/tests/integration/test_backup_aws.py
index 2d4883c699..8100c1afc0 100644
--- a/tests/integration/test_backup_aws.py
+++ b/tests/integration/test_backup_aws.py
@@ -28,7 +28,7 @@
 logger = logging.getLogger(__name__)
 
 S3_INTEGRATOR = "s3-integrator"
-S3_INTEGRATOR_CHANNEL = "latest/stable"
+S3_INTEGRATOR_CHANNEL = "1/edge"  # Use edge for s390x
 TIMEOUT = 15 * 60
 CLUSTER_ADMIN_USER = "clusteradmin"
 CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"
diff --git a/tests/integration/test_backup_ceph.py b/tests/integration/test_backup_ceph.py
index 078cc9ed17..41d3671c03 100644
--- a/tests/integration/test_backup_ceph.py
+++ b/tests/integration/test_backup_ceph.py
@@ -32,7 +32,7 @@
 logger = logging.getLogger(__name__)
 
 S3_INTEGRATOR = "s3-integrator"
-S3_INTEGRATOR_CHANNEL = "latest/stable"
+S3_INTEGRATOR_CHANNEL = "1/edge"  # Use edge for s390x
 TIMEOUT = 10 * 60
 CLUSTER_ADMIN_USER = "clusteradmin"
 CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"
diff --git a/tests/integration/test_backup_gcp.py b/tests/integration/test_backup_gcp.py
index 0fcc8055ff..0d3528b687 100644
--- a/tests/integration/test_backup_gcp.py
+++ b/tests/integration/test_backup_gcp.py
@@ -28,7 +28,7 @@
 logger = logging.getLogger(__name__)
 
 S3_INTEGRATOR = "s3-integrator"
-S3_INTEGRATOR_CHANNEL = "latest/stable"
+S3_INTEGRATOR_CHANNEL = "1/edge"  # Use edge for s390x
 TIMEOUT = 10 * 60
 CLUSTER_ADMIN_USER = "clusteradmin"
 CLUSTER_ADMIN_PASSWORD = "clusteradminpassword"
diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
index 6007dbcac1..fe744024d2 100644
--- a/tests/integration/test_tls.py
+++ b/tests/integration/test_tls.py
@@ -30,8 +30,8 @@
 
 if juju_.has_secrets:
     tls_app_name = "self-signed-certificates"
-    if architecture.architecture == "arm64":
-        tls_channel = "latest/edge"
+    if architecture.architecture == "s390x":
+        tls_channel = "1/edge"
     else:
         tls_channel = "latest/stable"
     tls_config = {"ca-common-name": "Test CA"}
@@ -87,9 +87,7 @@ async def test_enable_tls(ops_test: OpsTest) -> None:
     # Deploy TLS Certificates operator.
     logger.info("Deploy TLS operator")
     async with ops_test.fast_forward("60s"):
-        await ops_test.model.deploy(
-            tls_app_name, channel=tls_channel, config=tls_config, base="ubuntu@22.04"
-        )
+        await ops_test.model.deploy(tls_app_name, channel=tls_channel, config=tls_config)
         await ops_test.model.wait_for_idle(apps=[tls_app_name], status="active", timeout=15 * 60)
 
     # Relate with TLS charm
diff --git a/tests/spread/test_architecture.py/task.yaml b/tests/spread/test_architecture.py/task.yaml
deleted file mode 100644
index cad8633643..0000000000
--- a/tests/spread/test_architecture.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_architecture.py
-environment:
-  TEST_MODULE: test_architecture.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # This task requires charm built on different architecture from host
diff --git a/tests/spread/test_async_replication.py/task.yaml b/tests/spread/test_async_replication.py/task.yaml
deleted file mode 100644
index d1116ce09a..0000000000
--- a/tests/spread/test_async_replication.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_async_replication.py
-environment:
-  TEST_MODULE: high_availability/test_async_replication.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-variants:
-  - -juju29
diff --git a/tests/spread/test_backup_aws.py/task.yaml b/tests/spread/test_backup_aws.py/task.yaml
deleted file mode 100644
index b15ee3043f..0000000000
--- a/tests/spread/test_backup_aws.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_backup_aws.py
-environment:
-  TEST_MODULE: test_backup_aws.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # Requires CI secrets
diff --git a/tests/spread/test_backup_ceph.py/task.yaml b/tests/spread/test_backup_ceph.py/task.yaml
deleted file mode 100644
index 536927e44b..0000000000
--- a/tests/spread/test_backup_ceph.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_backup_ceph.py
-environment:
-  TEST_MODULE: test_backup_ceph.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_backup_gcp.py/task.yaml b/tests/spread/test_backup_gcp.py/task.yaml
deleted file mode 100644
index 627a039604..0000000000
--- a/tests/spread/test_backup_gcp.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_backup_gcp.py
-environment:
-  TEST_MODULE: test_backup_gcp.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # Requires CI secrets
diff --git a/tests/spread/test_backup_pitr_aws.py/task.yaml b/tests/spread/test_backup_pitr_aws.py/task.yaml
deleted file mode 100644
index aa215215e1..0000000000
--- a/tests/spread/test_backup_pitr_aws.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_backup_pitr_aws.py
-environment:
-  TEST_MODULE: test_backup_pitr_aws.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # Requires CI secrets
diff --git a/tests/spread/test_backup_pitr_gcp.py/task.yaml b/tests/spread/test_backup_pitr_gcp.py/task.yaml
deleted file mode 100644
index 80bcd16ee5..0000000000
--- a/tests/spread/test_backup_pitr_gcp.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_backup_pitr_gcp.py
-environment:
-  TEST_MODULE: test_backup_pitr_gcp.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # Requires CI secrets
diff --git a/tests/spread/test_database.py/task.yaml b/tests/spread/test_database.py/task.yaml
deleted file mode 100644
index c18f605c2e..0000000000
--- a/tests/spread/test_database.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_database.py
-environment:
-  TEST_MODULE: relations/test_database.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_db_router.py/task.yaml b/tests/spread/test_db_router.py/task.yaml
deleted file mode 100644
index 8dbaece8d4..0000000000
--- a/tests/spread/test_db_router.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_db_router.py
-environment:
-  TEST_MODULE: relations/test_db_router.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_primary_switchover.py/task.yaml b/tests/spread/test_primary_switchover.py/task.yaml
deleted file mode 100644
index f0b7e005c5..0000000000
--- a/tests/spread/test_primary_switchover.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_primary_switchover
-environment:
-  TEST_MODULE: high_availability/test_primary_switchover.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_relation_mysql_legacy.py/task.yaml b/tests/spread/test_relation_mysql_legacy.py/task.yaml
deleted file mode 100644
index 81bba459e5..0000000000
--- a/tests/spread/test_relation_mysql_legacy.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_relation_mysql_legacy.py
-environment:
-  TEST_MODULE: relations/test_relation_mysql_legacy.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_data_consistency.py/task.yaml b/tests/spread/test_replication_data_consistency.py/task.yaml
deleted file mode 100644
index 22b4c29ea6..0000000000
--- a/tests/spread/test_replication_data_consistency.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_data_consistency.py
-environment:
-  TEST_MODULE: high_availability/test_replication_data_consistency.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_data_isolation.py/task.yaml b/tests/spread/test_replication_data_isolation.py/task.yaml
deleted file mode 100644
index 6980b5ebcc..0000000000
--- a/tests/spread/test_replication_data_isolation.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_data_isolation.py
-environment:
-  TEST_MODULE: high_availability/test_replication_data_isolation.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_logs_rotation.py/task.yaml b/tests/spread/test_replication_logs_rotation.py/task.yaml
deleted file mode 100644
index cfa66c7a9c..0000000000
--- a/tests/spread/test_replication_logs_rotation.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_logs_rotation.py
-environment:
-  TEST_MODULE: high_availability/test_replication_logs_rotation.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_reelection.py/task.yaml b/tests/spread/test_replication_reelection.py/task.yaml
deleted file mode 100644
index ec378bdb51..0000000000
--- a/tests/spread/test_replication_reelection.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_reelection.py
-environment:
-  TEST_MODULE: high_availability/test_replication_reelection.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_scaling.py/task.yaml b/tests/spread/test_replication_scaling.py/task.yaml
deleted file mode 100644
index 07ab6765fe..0000000000
--- a/tests/spread/test_replication_scaling.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_scaling.py
-environment:
-  TEST_MODULE: high_availability/test_replication_scaling.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_unit_endpoints.py/task.yaml b/tests/spread/test_replication_unit_endpoints.py/task.yaml
deleted file mode 100644
index 2f8325ac9f..0000000000
--- a/tests/spread/test_replication_unit_endpoints.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_unit_endpoints.py
-environment:
-  TEST_MODULE: high_availability/test_replication_unit_endpoints.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_replication_variables.py/task.yaml b/tests/spread/test_replication_variables.py/task.yaml
deleted file mode 100644
index 81e303c58a..0000000000
--- a/tests/spread/test_replication_variables.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_replication_variables.py
-environment:
-  TEST_MODULE: high_availability/test_replication_variables.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_saturate_max_connections.py/task.yaml b/tests/spread/test_saturate_max_connections.py/task.yaml
deleted file mode 100644
index febd627c8d..0000000000
--- a/tests/spread/test_saturate_max_connections.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_saturate_max_connections.py
-environment:
-  TEST_MODULE: test_saturate_max_connections.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_network_cut.py/task.yaml b/tests/spread/test_self_healing_network_cut.py/task.yaml
deleted file mode 100644
index dc94e595f7..0000000000
--- a/tests/spread/test_self_healing_network_cut.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_network_cut.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_network_cut.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_process_frozen.py/task.yaml b/tests/spread/test_self_healing_process_frozen.py/task.yaml
deleted file mode 100644
index 131abb77a1..0000000000
--- a/tests/spread/test_self_healing_process_frozen.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_process_frozen.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_process_frozen.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_process_killed.py/task.yaml b/tests/spread/test_self_healing_process_killed.py/task.yaml
deleted file mode 100644
index 1909addc9f..0000000000
--- a/tests/spread/test_self_healing_process_killed.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_process_killed.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_process_killed.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_restart_forceful.py/task.yaml b/tests/spread/test_self_healing_restart_forceful.py/task.yaml
deleted file mode 100644
index 92f8b3f656..0000000000
--- a/tests/spread/test_self_healing_restart_forceful.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_restart_forceful.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_restart_forceful.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_restart_graceful.py/task.yaml b/tests/spread/test_self_healing_restart_graceful.py/task.yaml
deleted file mode 100644
index 38543523cb..0000000000
--- a/tests/spread/test_self_healing_restart_graceful.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_restart_graceful.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_restart_graceful.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_stop_all.py/task.yaml b/tests/spread/test_self_healing_stop_all.py/task.yaml
deleted file mode 100644
index 5e19cd4a0e..0000000000
--- a/tests/spread/test_self_healing_stop_all.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_stop_all.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_stop_all.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_self_healing_stop_primary.py/task.yaml b/tests/spread/test_self_healing_stop_primary.py/task.yaml
deleted file mode 100644
index d438a47629..0000000000
--- a/tests/spread/test_self_healing_stop_primary.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_self_healing_stop_primary.py
-environment:
-  TEST_MODULE: high_availability/test_self_healing_stop_primary.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_shared_db.py/task.yaml b/tests/spread/test_shared_db.py/task.yaml
deleted file mode 100644
index 322fb01ae7..0000000000
--- a/tests/spread/test_shared_db.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_shared_db.py
-environment:
-  TEST_MODULE: relations/test_shared_db.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_spaced_db.py/task.yaml b/tests/spread/test_spaced_db.py/task.yaml
deleted file mode 100644
index 3dc1cd7e66..0000000000
--- a/tests/spread/test_spaced_db.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_spaced_db.py
-environment:
-  TEST_MODULE: spaces/test_spaced_db.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_subordinate_charms.py/task.yaml b/tests/spread/test_subordinate_charms.py/task.yaml
deleted file mode 100644
index 3b281deb3d..0000000000
--- a/tests/spread/test_subordinate_charms.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_subordinate_charms.py
-environment:
-  TEST_MODULE: test_subordinate_charms.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-backends:
-  - -lxd-vm  # Requires CI secrets
diff --git a/tests/spread/test_upgrade.py/task.yaml b/tests/spread/test_upgrade.py/task.yaml
deleted file mode 100644
index f99ac69384..0000000000
--- a/tests/spread/test_upgrade.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_upgrade.py
-environment:
-  TEST_MODULE: high_availability/test_upgrade.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_upgrade_from_stable.py/task.yaml b/tests/spread/test_upgrade_from_stable.py/task.yaml
deleted file mode 100644
index ffdb002d25..0000000000
--- a/tests/spread/test_upgrade_from_stable.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_upgrade_from_stable.py
-environment:
-  TEST_MODULE: high_availability/test_upgrade_from_stable.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_upgrade_rollback_incompat.py/task.yaml b/tests/spread/test_upgrade_rollback_incompat.py/task.yaml
deleted file mode 100644
index 5906466557..0000000000
--- a/tests/spread/test_upgrade_rollback_incompat.py/task.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-summary: test_upgrade_rollback_incompat.py
-environment:
-  TEST_MODULE: high_availability/test_upgrade_rollback_incompat.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
-systems:
-  - -ubuntu-24.04-arm
diff --git a/tests/spread/test_upgrade_skip_pre_upgrade_check.py/task.yaml b/tests/spread/test_upgrade_skip_pre_upgrade_check.py/task.yaml
deleted file mode 100644
index a57bec914b..0000000000
--- a/tests/spread/test_upgrade_skip_pre_upgrade_check.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_upgrade_skip_pre_upgrade_check.py
-environment:
-  TEST_MODULE: high_availability/test_upgrade_skip_pre_upgrade_check.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results
diff --git a/tests/spread/test_vm_reboot.py/task.yaml b/tests/spread/test_vm_reboot.py/task.yaml
deleted file mode 100644
index 22cc2c8f5d..0000000000
--- a/tests/spread/test_vm_reboot.py/task.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-summary: test_vm_reboot.py
-environment:
-  TEST_MODULE: test_vm_reboot.py
-execute: |
-  tox run -e integration -- "tests/integration/$TEST_MODULE" --model testing --alluredir="$SPREAD_TASK/allure-results"
-artifacts:
-  - allure-results