diff --git a/src/test/java/io/supertokens/test/ActiveUsersTest.java b/src/test/java/io/supertokens/test/ActiveUsersTest.java
index e7d7b25a2..8f85f6d3f 100644
--- a/src/test/java/io/supertokens/test/ActiveUsersTest.java
+++ b/src/test/java/io/supertokens/test/ActiveUsersTest.java
@@ -55,7 +55,7 @@ public void updateAndCountUserLastActiveTest() throws Exception {
 
         assert ActiveUsers.countUsersActiveSince(main, now) == 2;
 
-        Thread.sleep(100);
+        Thread.sleep(1);
 
         long now2 = System.currentTimeMillis();
 
diff --git a/src/test/java/io/supertokens/test/emailpassword/api/SignInAPITest2_7.java b/src/test/java/io/supertokens/test/emailpassword/api/SignInAPITest2_7.java
index 8fdfcbdea..90305b605 100644
--- a/src/test/java/io/supertokens/test/emailpassword/api/SignInAPITest2_7.java
+++ b/src/test/java/io/supertokens/test/emailpassword/api/SignInAPITest2_7.java
@@ -140,6 +140,7 @@ public void testGoodInput() throws Exception {
         responseBody.addProperty("email", "random@gmail.com");
         responseBody.addProperty("password", "validPass123");
 
+        Thread.sleep(1); // add a small delay to ensure a unique timestamp
         long beforeSignIn = System.currentTimeMillis();
 
         JsonObject signInResponse = HttpRequestForTesting.sendJsonPOSTRequest(process.getProcess(), "",
diff --git a/src/test/java/io/supertokens/test/emailpassword/api/SignUpAPITest2_7.java b/src/test/java/io/supertokens/test/emailpassword/api/SignUpAPITest2_7.java
index bd4b97285..c85bc6c25 100644
--- a/src/test/java/io/supertokens/test/emailpassword/api/SignUpAPITest2_7.java
+++ b/src/test/java/io/supertokens/test/emailpassword/api/SignUpAPITest2_7.java
@@ -70,7 +70,7 @@ public void testBadInput() throws Exception {
             return;
         }
 
-        long beforeTestTs = System.currentTimeMillis();
+        long startTs = System.currentTimeMillis();
 
         {
             try {
@@ -111,7 +111,7 @@ public void testBadInput() throws Exception {
             }
         }
 
-        int activeUsers = ActiveUsers.countUsersActiveSince(process.getProcess(), beforeTestTs);
+        int activeUsers = ActiveUsers.countUsersActiveSince(process.getProcess(), startTs);
         assert (activeUsers == 0);
 
         process.kill();
@@ -130,7 +130,7 @@ public void testGoodInput() throws Exception {
             return;
         }
 
-        long beforeSignUpTs = System.currentTimeMillis();
+        long startTS = System.currentTimeMillis();
 
         JsonObject signUpResponse = Utils.signUpRequest_2_5(process, "random@gmail.com", "validPass123");
         assertEquals(signUpResponse.get("status").getAsString(), "OK");
@@ -140,7 +140,7 @@ public void testGoodInput() throws Exception {
         assertEquals(signUpUser.get("email").getAsString(), "random@gmail.com");
         assertNotNull(signUpUser.get("id"));
 
-        int activeUsers = ActiveUsers.countUsersActiveSince(process.getProcess(), beforeSignUpTs);
+        int activeUsers = ActiveUsers.countUsersActiveSince(process.getProcess(), startTS);
         assert (activeUsers == 1);
 
         UserInfo user = StorageLayer.getEmailPasswordStorage(process.getProcess())
diff --git a/src/test/java/io/supertokens/test/session/api/RefreshSessionAPITest2_7.java b/src/test/java/io/supertokens/test/session/api/RefreshSessionAPITest2_7.java
index 7f8e9ea71..864fe993c 100644
--- a/src/test/java/io/supertokens/test/session/api/RefreshSessionAPITest2_7.java
+++ b/src/test/java/io/supertokens/test/session/api/RefreshSessionAPITest2_7.java
@@ -439,6 +439,7 @@ public void activeUsersTest() throws Exception {
         request.add("userDataInDatabase", userDataInDatabase);
         request.addProperty("enableAntiCsrf", false);
 
+        Thread.sleep(1); // Ensures a unique timestamp
         long startTs = System.currentTimeMillis();
 
         JsonObject sessionInfo = HttpRequestForTesting.sendJsonPOSTRequest(process.getProcess(), "",
@@ -452,6 +453,7 @@ public void activeUsersTest() throws Exception {
                 sessionInfo.get("refreshToken").getAsJsonObject().get("token").getAsString());
         sessionRefreshBody.addProperty("enableAntiCsrf", false);
 
+        Thread.sleep(1); // ensures a unique timestamp
         long afterSessionCreateTs = System.currentTimeMillis();
 
         JsonObject sessionRefreshResponse = HttpRequestForTesting.sendJsonPOSTRequest(process.getProcess(), "",
diff --git a/src/test/java/io/supertokens/test/session/api/SessionRemoveAPITest2_7.java b/src/test/java/io/supertokens/test/session/api/SessionRemoveAPITest2_7.java
index a0d81f6a3..c82758148 100644
--- a/src/test/java/io/supertokens/test/session/api/SessionRemoveAPITest2_7.java
+++ b/src/test/java/io/supertokens/test/session/api/SessionRemoveAPITest2_7.java
@@ -93,7 +93,7 @@ public void activeUsersTest() throws Exception {
         assertEquals(s2Info.get("status").getAsString(), "OK");
 
         // remove s2 and make sure they are returned
-
+        Thread.sleep(1); // ensures a unique timestamp
         long checkpoint1 = System.currentTimeMillis();
 
         JsonObject sessionRemoveBody = new JsonObject();
@@ -135,6 +135,7 @@ public void activeUsersTest() throws Exception {
                     "session");
             assertEquals(session2Info.get("status").getAsString(), "OK");
 
+            Thread.sleep(1); // ensures a unique timestamp
             long checkpoint1 = System.currentTimeMillis();
 
             // remove session using user id