diff --git a/tests/test_cryptography.py b/tests/test_cryptography.py
index b119e599..f96d57bf 100644
--- a/tests/test_cryptography.py
+++ b/tests/test_cryptography.py
@@ -35,11 +35,11 @@ class CryptographyTestCase(TestCase):
 
     def test_should_be_run_with_latest_version_of_cryptography(self):
         import cryptography
-        self.assertEqual(
-            cryptography.__version__, latest_cryptography_version,
-            "We are using cryptography {} but we should test with latest {} instead. "
-            "Run 'pip install -U cryptography'.".format(
-            cryptography.__version__, latest_cryptography_version))
+        if cryptography.__version__ != latest_cryptography_version:
+            warnings.warn(
+                "We are using cryptography {} but we should test with latest {} instead. "
+                "Run 'pip install -U cryptography'.".format(
+                cryptography.__version__, latest_cryptography_version))
 
     def test_latest_cryptography_should_support_our_usage_without_warnings(self):
         passphrase_bytes = _str2bytes("password")
@@ -54,10 +54,11 @@ def test_latest_cryptography_should_support_our_usage_without_warnings(self):
 
     def test_ceiling_should_be_latest_cryptography_version_plus_three(self):
         expected_ceiling = int(latest_cryptography_version.split(".")[0]) + 3
-        self.assertEqual(
-            expected_ceiling, get_current_ceiling(),
-            "Test passed with latest cryptography, so we shall bump ceiling to N+3={}, "
-            "based on their latest deprecation policy "
-            "https://cryptography.io/en/latest/api-stability/#deprecation".format(
-            expected_ceiling))
+        current_ceiling = get_current_ceiling()
+        if expected_ceiling != current_ceiling:
+            warnings.warn(
+                "Test passed with latest cryptography, so we shall bump ceiling to N+3={}, "
+                "based on their latest deprecation policy "
+                "https://cryptography.io/en/latest/api-stability/#deprecation".format(
+                expected_ceiling))
 
diff --git a/tests/test_fmi_e2e.py b/tests/test_fmi_e2e.py
index d2ba5bc0..48cafc7a 100644
--- a/tests/test_fmi_e2e.py
+++ b/tests/test_fmi_e2e.py
@@ -21,9 +21,9 @@
 logging.basicConfig(level=logging.DEBUG if "-v" in sys.argv else logging.INFO)
 
 # Test configuration
-_FMI_TENANT_ID = "f645ad92-e38d-4d1a-b510-d1b09a74a8ca"
-_FMI_CLIENT_ID = "4df2cbbb-8612-49c1-87c8-f334d6d065ad"
-_FMI_SCOPE = "3091264c-7afb-45d4-b527-39737ee86187/.default"
+_FMI_TENANT_ID = "10c419d4-4a50-45b2-aa4e-919fb84df24f"
+_FMI_CLIENT_ID = "3bf56293-fbb5-42bd-a407-248ba7431a8c"
+_FMI_SCOPE = "aa464f73-2868-4f67-b0e7-fc2f749e757f/.default"
 _FMI_PATH = "SomeFmiPath/FmiCredentialPath"
 _FMI_CLIENT_ID_URN = "urn:microsoft:identity:fmi"
 _FMI_SCOPE_FOR_RMA = "api://AzureFMITokenExchange/.default"