diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
index 84f7a39f..6751510f 100644
--- a/.github/workflows/integrate.yaml
+++ b/.github/workflows/integrate.yaml
@@ -95,7 +95,8 @@ jobs:
           channel: 1.25-strict/stable
           juju-channel: 3.1/stable
           charmcraft-channel: latest/candidate
-
+      # - name: Setup upterm session
+      #   uses: lhotari/action-upterm@v1
       - run: |
           sg snap_microk8s -c "tox -e ${{ matrix.charm }}-integration"
 
diff --git a/charms/kfp-api/tests/integration/test_charm.py b/charms/kfp-api/tests/integration/test_charm.py
index 9c19595a..a5e2a447 100644
--- a/charms/kfp-api/tests/integration/test_charm.py
+++ b/charms/kfp-api/tests/integration/test_charm.py
@@ -87,6 +87,7 @@ async def test_relational_db_relation_with_mysql_relation(self, ops_test: OpsTes
             apps=["mysql-k8s"],
             status="active",
             raise_on_blocked=True,
+            raise_on_error=False,
             timeout=90 * 30,
             idle_period=20,
         )
diff --git a/tests/integration/test_kfp_functional.py b/tests/integration/test_kfp_functional.py
index f5d73f75..d5bc1d03 100644
--- a/tests/integration/test_kfp_functional.py
+++ b/tests/integration/test_kfp_functional.py
@@ -74,7 +74,7 @@ async def test_build_and_deploy(ops_test: OpsTest, request, lightkube_client):
         raise_on_blocked=False,  # These apps block while waiting for each other to deploy/relate
         raise_on_error=True,
         timeout=3600,
-        idle_period=120,
+        idle_period=30,
     )
 
 # ---- KFP API Server focused test cases