diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java
similarity index 99%
rename from src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java
rename to src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java
index 19106b002..a32f3c367 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ImpISQLServerBulkRecord_IssuesTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/bulkCopy/ISQLServerBulkRecordIssuesTest.java
@@ -38,7 +38,7 @@
 import com.microsoft.sqlserver.testframework.Utils;
 
 @RunWith(JUnitPlatform.class)
-public class ImpISQLServerBulkRecord_IssuesTest extends AbstractTest {
+public class ISQLServerBulkRecordIssuesTest extends AbstractTest {
 
     static Statement stmt = null;
     static PreparedStatement pStmt = null;
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java
index d6d2c5cb4..2a6fae6c3 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/connection/ConnectionDriverTest.java
@@ -29,6 +29,7 @@
 import javax.sql.ConnectionEvent;
 import javax.sql.PooledConnection;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
@@ -462,6 +463,7 @@ public void testInvalidCombination() throws SQLServerException {
     }
 
     @Test
+    @Tag("slow")
     public void testIncorrectDatabaseWithFailoverPartner() throws SQLServerException {
         long timerStart = 0;
         long timerEnd = 0;
@@ -522,6 +524,7 @@ public void testGetSchema() throws SQLException {
      * @throws InterruptedException
      */
     @Test
+    @Tag("slow")
     public void testThreadInterruptedStatus() throws InterruptedException {
         Runnable runnable = new Runnable() {
             public void run() {
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 a4b839342..2141cac42 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/connection/TimeoutTest.java
@@ -14,6 +14,7 @@
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
@@ -31,6 +32,7 @@ public class TimeoutTest extends AbstractTest {
     final int waitForDelaySeconds = 10;
 
     @Test
+    @Tag("slow")
     public void testDefaultLoginTimeout() {
         long timerStart = 0;
         long timerEnd = 0;
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 c274e3611..944c79672 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
@@ -24,6 +24,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.atomic.AtomicReference;
 
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.platform.runner.JUnitPlatform;
 import org.junit.runner.RunWith;
@@ -130,6 +131,7 @@ public void testBatchedUnprepare() throws SQLException {
      * @throws SQLException
      */
     @Test
+    @Tag("slow")
     public void testStatementPooling() throws SQLException {
         // Test % handle re-use
         try (SQLServerConnection con = (SQLServerConnection)DriverManager.getConnection(connectionString)) {