diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java
index 9a9cd77679..1ae0008c79 100644
--- a/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/ConnectionIT.java
@@ -139,6 +139,7 @@ public void testLoginTimeoutViaDataSource() throws SQLException {
    * password but correct url Expectation is receiving incorrect username or password response from
    * server
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testProdConnectivity() throws SQLException {
     String[] deploymentUrls = {
@@ -566,6 +567,7 @@ public void testDifferentKeyLength() throws Exception {
   }
 
   /** Test production connectivity with insecure mode enabled. */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @ParameterizedTest
   @ValueSource(booleans = {true, false})
   public void testInsecureMode(boolean insecureModeInProperties) {
diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java
index f0917bcbaf..1ab51364dd 100644
--- a/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/ConnectionLatestIT.java
@@ -1653,6 +1653,7 @@ public void shouldFailOnSslExceptionWithLinkToTroubleShootingGuide() throws Inte
    * Test production connectivity with disableOCSPChecksMode enabled. This test applies to driver
    * versions after 3.21.0
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testDisableOCSPChecksMode() throws SQLException {
 
diff --git a/src/test/java/net/snowflake/client/jdbc/ConnectionWithDisableOCSPModeLatestIT.java b/src/test/java/net/snowflake/client/jdbc/ConnectionWithDisableOCSPModeLatestIT.java
index 5b9ae0454b..4e6f83827b 100644
--- a/src/test/java/net/snowflake/client/jdbc/ConnectionWithDisableOCSPModeLatestIT.java
+++ b/src/test/java/net/snowflake/client/jdbc/ConnectionWithDisableOCSPModeLatestIT.java
@@ -12,6 +12,7 @@
 import net.snowflake.client.core.SFTrustManager;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -36,6 +37,7 @@ public void tearDown() {
    * Test connectivity with disableOCSPChecksMode and insecure mode enabled. This test applies to
    * driver versions after 3.21.0
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testDisableOCSPChecksModeAndInsecureModeSet() throws SQLException {
 
@@ -50,6 +52,7 @@ public void testDisableOCSPChecksModeAndInsecureModeSet() throws SQLException {
    * Test production connectivity with only disableOCSPChecksMode enabled. This test applies to
    * driver versions after 3.21.0
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testDisableOCSPChecksModeSet() throws SQLException {
     boolean disableOCSPChecks = true;
@@ -62,6 +65,7 @@ public void testDisableOCSPChecksModeSet() throws SQLException {
    * Test production connectivity with only insecureMode enabled. This test applies to driver
    * versions after 3.21.0
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testInsecureModeSet() throws SQLException {
     boolean insecureMode = true;
@@ -74,6 +78,7 @@ public void testInsecureModeSet() throws SQLException {
    * Test production connectivity with disableOCSPChecksMode enabled AND insecureMode disabled. This
    * test applies to driver versions after 3.21.0
    */
+  @Disabled("Disable due to changed error response in backend. Follow up: SNOW-2021007")
   @Test
   public void testDisableOCSPChecksModeAndInsecureModeMismatched() throws SQLException {
     boolean disableOCSPChecks = true;