diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/SharedTimerTest.java b/src/test/java/com/microsoft/sqlserver/jdbc/SharedTimerTest.java
index 6aa8bff2e..48a70dd29 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/SharedTimerTest.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/SharedTimerTest.java
@@ -1,9 +1,16 @@
 package com.microsoft.sqlserver.jdbc;
 
-import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import java.util.ArrayList;
-import java.util.concurrent.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.junit.jupiter.api.Test;
 
 
 class SharedTimerTest {
@@ -11,8 +18,8 @@ class SharedTimerTest {
     @Test
     void getTimer() throws InterruptedException, ExecutionException, TimeoutException {
         final int iterations = 500;
-
         ExecutorService executor = Executors.newFixedThreadPool(2);
+
         try {
             ArrayList<CompletableFuture<?>> futures = new ArrayList<>(iterations);
             for (int i = 0; i < iterations; i++) {
@@ -22,6 +29,13 @@ void getTimer() throws InterruptedException, ExecutionException, TimeoutExceptio
             CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).get(2, TimeUnit.MINUTES);
         } finally {
             executor.shutdown();
+            // 5000ms wait time for the AzureDB connection to close, need full test in the
+            // test lab for the exact time
+            if (!executor.awaitTermination(5000, TimeUnit.MILLISECONDS)) {
+                executor.shutdownNow();
+            }
         }
+
+        assertFalse(SharedTimer.isRunning(), TestResource.getResource("R_sharedTimerStopOnNoRef"));
     }
 }
diff --git a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
index aa4252f95..03109ff93 100644
--- a/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
+++ b/src/test/java/com/microsoft/sqlserver/jdbc/TestResource.java
@@ -66,8 +66,7 @@ protected Object[][] getContents() {
             {"R_invalidClientSecret", "AADSTS7000215: Invalid client secret provided"},
             {"R_invalidCertFields",
                     "Error reading certificate, please verify the location of the certificate.signed fields invalid"},
-            {"R_invalidAADAuth",
-                    "Failed to authenticate the user {0} in Active Directory (Authentication={1})"},
+            {"R_invalidAADAuth", "Failed to authenticate the user {0} in Active Directory (Authentication={1})"},
             {"R_failedValidate", "failed to validate values in $0} "}, {"R_tableNotDropped", "table not dropped. "},
             {"R_connectionReset", "Connection reset"}, {"R_unknownException", "Unknown exception"},
             {"R_deadConnection", "Dead connection should be invalid"},
@@ -213,6 +212,7 @@ protected Object[][] getContents() {
             {"R_objectNullOrEmpty", "The {0} is null or empty."},
             {"R_cekDecryptionFailed", "Failed to decrypt a column encryption key using key store provider: {0}."},
             {"R_connectTimedOut", "connect timed out"},
+            {"R_sharedTimerStopOnNoRef", "SharedTimer should be stopped after all references are removed."},
             {"R_sessionKilled", "Cannot continue the execution because the session is in the kill state"},
             {"R_failedFedauth", "Failed to acquire fedauth token: "},
             {"R_noLoginModulesConfiguredForJdbcDriver",