diff --git a/src/test/java/io/supertokens/test/httpRequest/HttpRequestForTesting.java b/src/test/java/io/supertokens/test/httpRequest/HttpRequestForTesting.java
index f60c77299..80f02df37 100644
--- a/src/test/java/io/supertokens/test/httpRequest/HttpRequestForTesting.java
+++ b/src/test/java/io/supertokens/test/httpRequest/HttpRequestForTesting.java
@@ -84,7 +84,7 @@ public static <T> T sendGETRequest(Main main, String requestID, String url, Map<
         try {
             con = (HttpURLConnection) obj.openConnection();
             con.setConnectTimeout(connectionTimeoutMS);
-            con.setReadTimeout(readTimeoutMS);
+            con.setReadTimeout(readTimeoutMS + 1000);
             if (version != null) {
                 con.setRequestProperty("api-version", version + "");
             }
@@ -139,7 +139,7 @@ private static <T> T sendJsonRequest(Main main, String requestID, String url, Js
             con = (HttpURLConnection) obj.openConnection();
             con.setRequestMethod(method);
             con.setConnectTimeout(connectionTimeoutMS);
-            con.setReadTimeout(readTimeoutMS);
+            con.setReadTimeout(readTimeoutMS + 1000);
             con.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
             if (version != null) {
                 con.setRequestProperty("api-version", version + "");
@@ -249,7 +249,7 @@ public static <T> T sendJsonDELETERequestWithQueryParams(Main main, String reque
                     con = (HttpURLConnection) obj.openConnection();
                     con.setRequestMethod("DELETE");
                     con.setConnectTimeout(connectionTimeoutMS);
-                    con.setReadTimeout(readTimeoutMS);
+                    con.setReadTimeout(readTimeoutMS + 1000);
                     if (version != null) {
                         con.setRequestProperty("api-version", version + "");
                     }
diff --git a/src/test/java/io/supertokens/test/multitenant/StorageLayerTest.java b/src/test/java/io/supertokens/test/multitenant/StorageLayerTest.java
index 6f59ef3d5..59785a020 100644
--- a/src/test/java/io/supertokens/test/multitenant/StorageLayerTest.java
+++ b/src/test/java/io/supertokens/test/multitenant/StorageLayerTest.java
@@ -1689,7 +1689,7 @@ public void testOverwriteTenantForRaceConditions()
                         ));
                         break;
                     } catch (Exception e) {
-                        if (e.getMessage().toLowerCase().contains("request timed out") || e.getMessage().contains("concurrent delete")) {
+                        if (e.getMessage().toLowerCase().contains("request timed out") || e.getMessage().contains("concurrent delete") || e.getMessage().contains("concurrent update")) {
                             // retry, because connection was timed out, or
                             // in case of postgres, number of retries may not be enough, we retry here anyway
                             continue;
diff --git a/src/test/java/io/supertokens/test/totp/TOTPRecipeTest.java b/src/test/java/io/supertokens/test/totp/TOTPRecipeTest.java
index 00e04a178..0af4feaf5 100644
--- a/src/test/java/io/supertokens/test/totp/TOTPRecipeTest.java
+++ b/src/test/java/io/supertokens/test/totp/TOTPRecipeTest.java
@@ -503,8 +503,8 @@ public void updateDeviceNameTest() throws Exception {
         // Verify that the device name has been updated:
         TOTPDevice[] devices = Totp.getDevices(main, "user");
         assert (devices.length == 2);
-        assert (devices[0].deviceName.equals("device2"));
-        assert (devices[1].deviceName.equals("new-device-name"));
+        assert (devices[0].deviceName.equals("device2") && devices[1].deviceName.equals("new-device-name")
+                || devices[0].deviceName.equals("new-device-name") && devices[1].deviceName.equals("device2"));
 
         // Verify that TOTP verification still works:
         Totp.verifyDevice(main, "user", devices[0].deviceName, generateTotpCode(main, devices[0]));
@@ -533,8 +533,7 @@ public void getDevicesTest() throws Exception {
 
         TOTPDevice[] devices = Totp.getDevices(main, "user");
         assert (devices.length == 2);
-        assert devices[0].equals(device1);
-        assert devices[1].equals(device2);
+        assert (devices[0].equals(device1) && devices[1].equals(device2)) || (devices[1].equals(device1) && devices[0].equals(device2));
     }
 
     @Test
diff --git a/src/test/java/io/supertokens/test/totp/TOTPStorageTest.java b/src/test/java/io/supertokens/test/totp/TOTPStorageTest.java
index 4ad4a1011..ebd2bf133 100644
--- a/src/test/java/io/supertokens/test/totp/TOTPStorageTest.java
+++ b/src/test/java/io/supertokens/test/totp/TOTPStorageTest.java
@@ -139,8 +139,8 @@ public void createDeviceTests() throws Exception {
         storedDevices = storage.getDevices(new AppIdentifier(null, null), "user");
 
         assert (storedDevices.length == 2);
-        assert storedDevices[0].equals(device1);
-        assert storedDevices[1].equals(device2);
+        assert (storedDevices[0].equals(device1) && storedDevices[1].equals(device2))
+                || (storedDevices[0].equals(device2) && storedDevices[1].equals(device1));
 
         assertThrows(DeviceAlreadyExistsException.class,
                 () -> storage.createDevice(new AppIdentifier(null, null), device2Duplicate));
@@ -365,8 +365,8 @@ public void getDevicesTest() throws Exception {
         TOTPDevice[] storedDevices = storage.getDevices(new AppIdentifier(null, null), "user");
 
         assert (storedDevices.length == 2);
-        assert (storedDevices[0].deviceName.equals("d1"));
-        assert (storedDevices[1].deviceName.equals("d2"));
+        assert (storedDevices[0].deviceName.equals("d1") || storedDevices[1].deviceName.equals("d2"))
+                || (storedDevices[0].deviceName.equals("d2") || storedDevices[1].deviceName.equals("d1"));
 
         storedDevices = storage.getDevices(new AppIdentifier(null, null), "non-existent-user");
         assert (storedDevices.length == 0);