diff --git a/Test/Tests/AuthTests.swift b/Test/Tests/AuthTests.swift
index cd78d37b4..17d614cc2 100644
--- a/Test/Tests/AuthTests.swift
+++ b/Test/Tests/AuthTests.swift
@@ -412,7 +412,7 @@ class AuthTests: XCTestCase {
                 guard let errorInfo = stateChange.reason else {
                     fail("ErrorInfo is nil"); done(); return
                 }
-                expect(errorInfo.message).to(contain("No application found with id"))
+                expect(errorInfo.code).to(equal(ARTErrorCode.invalidCredentials.intValue))
                 done()
             }
             realtime.connection.once(.disconnected) { _ in
diff --git a/Test/Tests/RealtimeClientConnectionTests.swift b/Test/Tests/RealtimeClientConnectionTests.swift
index 8b4898cb1..30ec3cc8d 100644
--- a/Test/Tests/RealtimeClientConnectionTests.swift
+++ b/Test/Tests/RealtimeClientConnectionTests.swift
@@ -4132,7 +4132,8 @@ class RealtimeClientConnectionTests: XCTestCase {
                 guard let error = stateChange.reason else {
                     fail("Error is nil"); done(); return
                 }
-                XCTAssertTrue(error.code == ARTErrorCode.invalidCredential.rawValue)
+                // This is because, at time of writing, the production environment is handling connections using both frontend (which returns invalidCredential) and frontdoor (which returns invalidCredentials). So we need to handle both cases at least for now (unlike other tests, which use sandbox which is 100% using frontdoor).
+                XCTAssertTrue(error.code == ARTErrorCode.invalidCredential.rawValue || error.code == ARTErrorCode.invalidCredentials.rawValue)
                 done()
             }
         }
diff --git a/Test/Tests/RestClientTests.swift b/Test/Tests/RestClientTests.swift
index b98cd4f16..1d04d7bb6 100644
--- a/Test/Tests/RestClientTests.swift
+++ b/Test/Tests/RestClientTests.swift
@@ -193,7 +193,7 @@ class RestClientTests: XCTestCase {
 
         let publishTask = publishTestMessage(client, channelName: test.uniqueChannelName(), failOnError: false)
 
-        expect(publishTask.error?.code).toEventually(equal(ARTErrorCode.invalidCredential.intValue), timeout: testTimeout)
+        expect(publishTask.error?.code).toEventually(equal(ARTErrorCode.invalidCredentials.intValue), timeout: testTimeout)
     }
 
     func test__018__RestClient__initializer__should_accept_a_token() throws {
@@ -234,7 +234,7 @@ class RestClientTests: XCTestCase {
 
         let publishTask = publishTestMessage(client, channelName: test.uniqueChannelName(), failOnError: false)
 
-        expect(publishTask.error?.code).toEventually(equal(ARTErrorCode.invalidCredential.intValue), timeout: testTimeout)
+        expect(publishTask.error?.code).toEventually(equal(ARTErrorCode.invalidCredentials.intValue), timeout: testTimeout)
     }
 
     // RSC2