diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
index 02336f79c6..3fbf0d4d81 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/AESetup.java
@@ -339,7 +339,7 @@ protected static void createTable(String tableName, String cekName, String table
             TestUtils.dropTableIfExists(tableName, stmt);
             sql = String.format(createSql, tableName, sql);
             stmt.execute(sql);
-            stmt.execute("DBCC FREEPROCCACHE");
+            TestUtils.freeProcCache(stmt);
         } catch (SQLException e) {
             fail(e.getMessage());
         }
@@ -373,7 +373,7 @@ protected static void createPrecisionTable(String tableName, String table[][], S
             }
             sql = String.format(createSql, tableName, sql);
             stmt.execute(sql);
-            stmt.execute("DBCC FREEPROCCACHE");
+            TestUtils.freeProcCache(stmt);
         } catch (SQLException e) {
             fail(e.getMessage());
         }
@@ -401,7 +401,7 @@ protected static void createScaleTable(String tableName, String table[][], Strin
 
             sql = String.format(createSql, tableName, sql);
             stmt.execute(sql);
-            stmt.execute("DBCC FREEPROCCACHE");
+            TestUtils.freeProcCache(stmt);
         } catch (SQLException e) {
             fail(e.getMessage());
         }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java
index 95531d6981..d259b35a55 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/AlwaysEncrypted/CallableStatementTest.java
@@ -2201,7 +2201,7 @@ protected static void createDateTableCallableStatement(String cekName) throws SQ
                 SQLServerStatement stmt = (SQLServerStatement) con.createStatement()) {
             TestUtils.dropTableIfExists(DATE_TABLE_AE, stmt);
             stmt.execute(sql);
-            stmt.execute("DBCC FREEPROCCACHE");
+            TestUtils.freeProcCache(stmt);
         } catch (SQLException e) {
             fail(e.getMessage());
         }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
index 12eea46cf2..e024e98cba 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/SQLServerConnectionTest.java
@@ -482,7 +482,13 @@ public void testConnectCountInLoginAndCorrectRetryCount() {
                 assertTrue(con == null, TestResource.getResource("R_shouldNotConnect"));
             }
         } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase")), e.getMessage());
+            assertTrue(
+                    e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase"))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && (e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase())
+                                    || e.getMessage().toLowerCase()
+                                            .contains(TestResource.getResource("R_MInotAvailable").toLowerCase()))),
+                    e.getMessage());
             long totalTime = System.currentTimeMillis() - timerStart;
 
             // Maximum is unknown, but is needs to be less than longLoginTimeout or else this is an issue.
@@ -795,13 +801,22 @@ public void testIncorrectDatabase() throws SQLException {
                 assertTrue(timeDiff <= milsecs, form.format(msgArgs));
             }
         } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase")), e.getMessage());
+            assertTrue(
+                    e.getMessage().contains(TestResource.getResource("R_cannotOpenDatabase"))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null
+                                    && e.getMessage().toLowerCase()
+                                            .contains(TestResource.getResource("R_loginFailedMI").toLowerCase())),
+                    e.getMessage());
             timerEnd = System.currentTimeMillis();
         }
     }
 
     @Test
     public void testIncorrectUserName() throws SQLException {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         long timerStart = 0;
         long timerEnd = 0;
         final long milsecs = threshHoldForNoRetryInMilliseconds;
@@ -819,13 +834,22 @@ public void testIncorrectUserName() throws SQLException {
                 assertTrue(timeDiff <= milsecs, form.format(msgArgs));
             }
         } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
+            assertTrue(
+                    e.getMessage().contains(TestResource.getResource("R_loginFailed"))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null
+                                    && e.getMessage().toLowerCase()
+                                            .contains(TestResource.getResource("R_loginFailedMI").toLowerCase())),
+                    e.getMessage());
             timerEnd = System.currentTimeMillis();
         }
     }
 
     @Test
     public void testIncorrectPassword() throws SQLException {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         long timerStart = 0;
         long timerEnd = 0;
         final long milsecs = threshHoldForNoRetryInMilliseconds;
@@ -843,7 +867,12 @@ public void testIncorrectPassword() throws SQLException {
                 assertTrue(timeDiff <= milsecs, form.format(msgArgs));
             }
         } catch (Exception e) {
-            assertTrue(e.getMessage().contains(TestResource.getResource("R_loginFailed")));
+            assertTrue(
+                    e.getMessage().contains(TestResource.getResource("R_loginFailed"))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null
+                                    && e.getMessage().toLowerCase()
+                                            .contains(TestResource.getResource("R_loginFailedMI").toLowerCase())),
+                    e.getMessage());
             timerEnd = System.currentTimeMillis();
         }
     }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
index a630f5e0da..b98171c23e 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
@@ -220,5 +220,6 @@ protected Object[][] getContents() {
             {"R_unexpectedThreadCount", "Thread count is higher than expected."},
             {"R_expectedClassDoesNotMatchActualClass",
                     "Expected column class {0} does not match actual column class {1} for column {2}."},
-            {"R_loginFailedMSI", "Login failed for user '<token-identified principal>'"}};
+            {"R_loginFailedMI", "Login failed for user '<token-identified principal>'"},
+            {"R_MInotAvailable", "Managed Identity authentication is not available"},};
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java
index 8db118b4d7..b17e86c0d2 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/TestUtils.java
@@ -535,7 +535,7 @@ public static void dropDatabaseIfExists(String databaseName, String connectionSt
      */
     public static void dropSchemaIfExists(String schemaName, Statement stmt) throws SQLException {
         stmt.execute("if EXISTS (SELECT * FROM sys.schemas where name = '" + escapeSingleQuotes(schemaName)
-                + "') DROP SCHEMA " + AbstractSQLGenerator.escapeIdentifier(schemaName));
+                + "') DROP SCHEMA" + AbstractSQLGenerator.escapeIdentifier(schemaName));
     }
 
     /**
@@ -1135,4 +1135,12 @@ public static String getConnectionID(
         SQLServerConnection conn = (SQLServerConnection) physicalConnection.get(pc);
         return (String) traceID.get(conn);
     }
+
+    public static void freeProcCache(Statement stmt) {
+        try {
+            stmt.execute("DBCC FREEPROCCACHE");
+        } catch (Exception e) {
+            // ignore error - some tests fails due to permission issues from managed identity, this does not seem to affect tests
+        }
+    }
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/connection/PoolingTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/connection/PoolingTest.java
index d99d846ef5..57a11a7258 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/connection/PoolingTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/connection/PoolingTest.java
@@ -152,6 +152,10 @@ public void testConnectionPoolClose() throws SQLException {
 
     @Test
     public void testConnectionPoolClientConnectionId() throws SQLException {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         SQLServerXADataSource ds = new SQLServerXADataSource();
         ds.setURL(connectionString);
         PooledConnection pc = null;
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
index 268fda7361..d7290b2621 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
@@ -68,6 +68,8 @@ public void testDefaultLoginTimeout() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_tcpipConnectionToHost").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -95,6 +97,8 @@ public void testURLLoginTimeout() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_tcpipConnectionToHost").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -122,6 +126,8 @@ public void testDMLoginTimeoutApplied() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_tcpipConnectionToHost").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -150,6 +156,9 @@ public void testDMLoginTimeoutNotApplied() {
                 assertTrue(
                         (e.getMessage().toLowerCase()
                                 .contains(TestResource.getResource("R_tcpipConnectionToHost").toLowerCase()))
+                                || (TestUtils.getProperty(connectionString, "msiClientId") != null
+                                        && e.getMessage().toLowerCase()
+                                                .contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                                 || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                         .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                         e.getMessage());
@@ -181,6 +190,8 @@ public void testConnectRetryDisable() {
 
             assertTrue(
                     e.getMessage().matches(TestUtils.formatErrorMsg("R_tcpipConnectionFailed"))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -207,6 +218,8 @@ public void testConnectRetryBadServer() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_tcpipConnectionToHost").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -220,6 +233,10 @@ public void testConnectRetryBadServer() {
     // Test connect retry for database error
     @Test
     public void testConnectRetryServerError() {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         long totalTime = 0;
         long timerStart = System.currentTimeMillis();
         int interval = defaultTimeout; // long interval so we can tell if there was a retry
@@ -237,6 +254,8 @@ public void testConnectRetryServerError() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_cannotOpenDatabase").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -252,6 +271,10 @@ public void testConnectRetryServerError() {
     // Test connect retry for database error using Datasource
     @Test
     public void testConnectRetryServerErrorDS() {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         long totalTime = 0;
         long timerStart = System.currentTimeMillis();
         int interval = defaultTimeout; // long interval so we can tell if there was a retry
@@ -270,6 +293,8 @@ public void testConnectRetryServerErrorDS() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_cannotOpenDatabase").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
@@ -303,6 +328,8 @@ public void testConnectRetryTimeout() {
             assertTrue(
                     (e.getMessage().toLowerCase()
                             .contains(TestResource.getResource("R_cannotOpenDatabase").toLowerCase()))
+                            || (TestUtils.getProperty(connectionString, "msiClientId") != null && e.getMessage()
+                                    .toLowerCase().contains(TestResource.getResource("R_loginFailedMI").toLowerCase()))
                             || ((isSqlAzure() || isSqlAzureDW()) ? e.getMessage().toLowerCase()
                                     .contains(TestResource.getResource("R_connectTimedOut").toLowerCase()) : false),
                     e.getMessage());
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
index c140c19f81..65b76ae12b 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/databasemetadata/DatabaseMetaDataTest.java
@@ -196,6 +196,10 @@ public void testGetURL() throws SQLException {
      */
     @Test
     public void testDBUserLogin() throws SQLException {
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         try (Connection conn = getConnection()) {
             DatabaseMetaData databaseMetaData = conn.getMetaData();
             String connectionString = getConnectionString();
@@ -219,7 +223,8 @@ public void testDBUserLogin() throws SQLException {
 
             assertNotNull(userName, TestResource.getResource("R_userNameNull"));
             assertTrue(userName.equalsIgnoreCase(userFromConnectionString),
-                    TestResource.getResource("R_userNameNotMatch"));
+                    TestResource.getResource("R_userNameNotMatch") + "userName: " + userName + "from connectio string: "
+                            + userFromConnectionString);
         } catch (Exception e) {
             fail(TestResource.getResource("R_unexpectedErrorMessage") + e.getMessage());
         }
@@ -1049,8 +1054,6 @@ public static void terminate() throws SQLException {
             TestUtils.dropTableWithSchemaIfExists(tableNameWithSchema, stmt);
             TestUtils.dropProcedureWithSchemaIfExists(sprocWithSchema, stmt);
             TestUtils.dropSchemaIfExists(schema, stmt);
-            TestUtils.dropUserIfExists(newUserName, stmt);
-            TestUtils.dropLoginIfExists(newUserName, stmt);
         }
     }
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java
index bfd09d3b92..1e0112f028 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/fedauth/FedauthWithAE.java
@@ -307,7 +307,7 @@ private void createCMK(String cmkName, String keyStoreName, String keyPath, Stat
     private void callDbccFreeProcCache() throws SQLException {
         try (Connection connection = DriverManager.getConnection(adPasswordConnectionStr);
                 Statement stmt = connection.createStatement()) {
-            stmt.execute("DBCC FREEPROCCACHE");
+            TestUtils.freeProcCache(stmt);
         }
     }
 
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java
index 10853f2f6f..2e80407d3a 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/fips/FipsTest.java
@@ -50,7 +50,7 @@ public void fipsTrustServerCertificateTest() throws Exception {
             Assertions.fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLException e) {
             Assertions.assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidFipsConfig")),
-                    TestResource.getResource("R_invalidTrustCert"));
+                    TestResource.getResource("R_invalidTrustCert") + ": " + e.getMessage());
         }
     }
 
@@ -62,13 +62,18 @@ public void fipsTrustServerCertificateTest() throws Exception {
      */
     @Test
     public void fipsEncryptTest() throws Exception {
+        // test doesn't apply to managed identity as encrypt is set to on by default
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null && !(auth.equalsIgnoreCase("ActiveDirectoryManagedIdentity")
+                || auth.equalsIgnoreCase("ActiveDirectoryMSI")));
+
         Properties props = buildConnectionProperties();
         props.setProperty(Constants.ENCRYPT, Boolean.FALSE.toString());
         try (Connection con = PrepUtil.getConnection(connectionString, props)) {
             Assertions.fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLException e) {
             Assertions.assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidFipsConfig")),
-                    TestResource.getResource("R_invalidEncrypt"));
+                    TestResource.getResource("R_invalidTrustCert") + ": " + e.getMessage());
         }
     }
 
@@ -118,6 +123,11 @@ public void fipsDataSourcePropertyTest() throws Exception {
      */
     @Test
     public void fipsDatSourceEncrypt() {
+        // test doesn't apply to managed identity as encrypt is set to on by default
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null && !(auth.equalsIgnoreCase("ActiveDirectoryManagedIdentity")
+                || auth.equalsIgnoreCase("ActiveDirectoryMSI")));
+
         SQLServerDataSource ds = new SQLServerDataSource();
         setDataSourceProperties(ds);
         ds.setEncrypt(Constants.FALSE);
@@ -126,7 +136,7 @@ public void fipsDatSourceEncrypt() {
             Assertions.fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLException e) {
             Assertions.assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidFipsConfig")),
-                    TestResource.getResource("R_invalidEncrypt"));
+                    TestResource.getResource("R_invalidEncrypt") + ": " + e.getMessage());
         }
     }
 
@@ -146,7 +156,7 @@ public void fipsDataSourceTrustServerCertificateTest() throws Exception {
             Assertions.fail(TestResource.getResource("R_expectedExceptionNotThrown"));
         } catch (SQLException e) {
             Assertions.assertTrue(e.getMessage().contains(TestResource.getResource("R_invalidFipsConfig")),
-                    TestResource.getResource("R_invalidTrustCert"));
+                    TestResource.getResource("R_invalidTrustCert") + ": " + e.getMessage());
         }
     }
 
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/SQLServerErrorTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/SQLServerErrorTest.java
index b4ca10c046..7c7dc377e7 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/SQLServerErrorTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/SQLServerErrorTest.java
@@ -42,6 +42,11 @@ public static void setupTests() throws Exception {
     @Test
     @Tag(Constants.xAzureSQLDW)
     public void testLoginFailedError() {
+        // test to remove password only valid for password auth
+        String auth = TestUtils.getProperty(connectionString, "authentication");
+        org.junit.Assume.assumeTrue(auth != null
+                && (auth.equalsIgnoreCase("SqlPassword") || auth.equalsIgnoreCase("ActiveDirectoryPassword")));
+
         SQLServerDataSource ds = new SQLServerDataSource();
         ds.setURL(connectionString);
         ds.setLoginTimeout(loginTimeOutInSeconds);
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java
index 0dace62b22..47b771dc34 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/BatchExecutionTest.java
@@ -188,6 +188,8 @@ public void testValidTimezonesDstTimestampBatchInsertWithBulkCopy() throws Excep
                 pstmt.setTimestamp(1, timestamp, gmtCal);
                 pstmt.addBatch();
                 pstmt.executeBatch();
+            } catch (Exception e) {
+                fail(e.getMessage());
             }
 
             // Insert Timestamp using bulkcopy for batch insert
@@ -200,6 +202,8 @@ public void testValidTimezonesDstTimestampBatchInsertWithBulkCopy() throws Excep
                 pstmt.setTimestamp(1, timestamp, gmtCal);
                 pstmt.addBatch();
                 pstmt.executeBatch();
+            } catch (Exception e) {
+                fail(e.getMessage());
             }
 
             // Compare Timestamp values inserted, should be the same
@@ -225,6 +229,8 @@ public void testValidTimezonesDstTimestampBatchInsertWithBulkCopy() throws Excep
                 assertEquals(ts0, ts1, failureMsg);
                 assertEquals(t0, t1, failureMsg);
                 assertEquals(d0, d1, failureMsg);
+            } catch (Exception e) {
+                fail(e.getMessage());
             }
         }
     }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java
index 79862dfcd4..b21372c965 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/unit/statement/PreparedStatementTest.java
@@ -258,7 +258,9 @@ public void testBatchedUnprepare() throws SQLException {
             con.setStatementPoolingCacheSize(0);
 
             // Clean-up proc cache
-            this.executeSQL(con, "DBCC FREEPROCCACHE;");
+            try (Statement stmt = con.createStatement()) {
+                TestUtils.freeProcCache(stmt);
+            }
 
             String lookupUniqueifier = UUID.randomUUID().toString();
 
diff --git a/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java b/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
index 3590aa7f2f..5078954c9a 100644
--- a/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
+++ b/src/test/java/com/microsoft/sqlserver/testframework/AbstractTest.java
@@ -5,6 +5,8 @@
 
 package com.microsoft.sqlserver.testframework;
 
+import static org.junit.jupiter.api.Assertions.fail;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
@@ -299,19 +301,23 @@ protected static void setupConnectionString() {
     }
 
     protected static void setConnection() throws Exception {
-        setupConnectionString();
+        try {
+            setupConnectionString();
 
-        Assertions.assertNotNull(connectionString, TestResource.getResource("R_ConnectionStringNull"));
-        Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".SQLServerDriver");
-        if (!SQLServerDriver.isRegistered()) {
-            SQLServerDriver.register();
-        }
-        if (null == connection || connection.isClosed()) {
-            connection = getConnection();
-        }
-        isSqlAzureOrAzureDW(connection);
+            Assertions.assertNotNull(connectionString, TestResource.getResource("R_ConnectionStringNull"));
+            Class.forName(Constants.MSSQL_JDBC_PACKAGE + ".SQLServerDriver");
+            if (!SQLServerDriver.isRegistered()) {
+                SQLServerDriver.register();
+            }
+            if (null == connection || connection.isClosed()) {
+                connection = getConnection();
+            }
+            isSqlAzureOrAzureDW(connection);
 
-        checkSqlOS(connection);
+            checkSqlOS(connection);
+        } catch (Exception e) {
+            fail("setConnection failed, connectionString=" + connectionString + "\nException: " + e.getMessage());
+        }
     }
 
     /**