diff --git a/tests/test-cases/02-echo-api-oidc.yml b/tests/test-cases/02-echo-api-oidc.yml
index 091699d..8da5eac 100644
--- a/tests/test-cases/02-echo-api-oidc.yml
+++ b/tests/test-cases/02-echo-api-oidc.yml
@@ -6,15 +6,26 @@
   vars:
     threescale_cicd_openapi_file: '{{ playbook_dir }}/api-contracts/echo-api-oidc.yaml'
   tasks:
+  # With 3scale SaaS, there is a race condition where Zync would update the SSO client
+  # after we patched it and thus reverts our changes.
+  #
+  # As a temporary fix the smoke tests are disabled with OIDC in the SaaS environment
+
   - name: Generate a random system_name for this test run
     import_tasks: "common/random-system-name.yml"
     
   # Test a first deployment
   - import_role:
       name: 'nmasse-itix.threescale-cicd'
+    vars:
+      # TODO: remove me as soon as proper OIDC support is implemented for SaaS
+      threescale_cicd_openapi_smoketest_operation: '{{ '''' if inventory_hostname is match(".*[.]3scale[.]net") else ''Echo'' }}'
   # Verify idempotence
   - import_role:
       name: 'nmasse-itix.threescale-cicd'
+    vars:
+      # TODO: remove me as soon as proper OIDC support is implemented for SaaS
+      threescale_cicd_openapi_smoketest_operation: '{{ '''' if inventory_hostname is match(".*[.]3scale[.]net") else ''Echo'' }}'
   # Delete the service
   - import_role:
       name: 'nmasse-itix.threescale-cicd'