diff --git a/.github/scripts/end2end/run-e2e-ctst.sh b/.github/scripts/end2end/run-e2e-ctst.sh
index d51ee69cf..8249edcea 100755
--- a/.github/scripts/end2end/run-e2e-ctst.sh
+++ b/.github/scripts/end2end/run-e2e-ctst.sh
@@ -125,6 +125,7 @@ EOF
 
 # Set up environment variables for testing
 kubectl set env deployment end2end-connector-cloudserver SCUBA_HEALTHCHECK_FREQUENCY=100
+kubectl set env deployment end2end-ops-scuba SCUBA_INFLIGHT_SERVICE_FLUSH_FREQUENCY_SECONDS=100
 kubectl rollout status deployment end2end-connector-cloudserver
 
 # disable moniroting of count-items
diff --git a/tests/ctst/common/hooks.ts b/tests/ctst/common/hooks.ts
index 35c54c3a5..6b23625ff 100644
--- a/tests/ctst/common/hooks.ts
+++ b/tests/ctst/common/hooks.ts
@@ -55,7 +55,13 @@ After(async function (this: Zenko, results) {
     );
 });
 
-After({ tags: '@Quotas' }, async function () {
+After({ tags: '@Quotas' }, async function (this: Zenko, results) {
+    if (results.result?.status === 'FAILED') {
+        this.logger.warn('quota was not cleaned for test', {
+            bucket: this.getSaved<string>('bucketName'),
+        });
+        return;
+    }
     await teardownQuotaScenarios(this as Zenko);
 });