diff --git a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
index 1c5568a01d..071ac50d57 100644
--- a/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
+++ b/node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
@@ -1677,7 +1677,7 @@ open class VaultQueryTests {
     @Test
     fun `unconsumed linear heads for linearId between two timestamps for a given external id`() {
         val start = Instant.now()
-        val end = start.plus(3, ChronoUnit.SECONDS)
+        val end = start.plus(6, ChronoUnit.SECONDS) //Enterprise: extended timeout for TC
 
         database.transaction {
             vaultFiller.fillWithSomeTestLinearStates(1, "TEST1")
diff --git a/testing/test-utils/src/main/resources/database-scripts/azure-sql/master-user-setup.sql b/testing/test-utils/src/main/resources/database-scripts/azure-sql/master-user-setup.sql
index 5d87ad78f9..99ae6d18f6 100644
--- a/testing/test-utils/src/main/resources/database-scripts/azure-sql/master-user-setup.sql
+++ b/testing/test-utils/src/main/resources/database-scripts/azure-sql/master-user-setup.sql
@@ -21,7 +21,7 @@ CREATE LOGIN BobPlc_10012 WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN CharlieLtd WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN CharlieLtd_10000 WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN CharlieLtd_10003 WITH PASSWORD = 'yourStrong(!)Password';
-CREATE LOGIN CharlieLtd WITH PASSWORD = 'yourStrong(!)Password';
+CREATE LOGIN CharlieLtd_10006 WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN DistributedService_0 WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN DistributedService_1 WITH PASSWORD = 'yourStrong(!)Password';
 CREATE LOGIN NetworkMapService WITH PASSWORD = 'yourStrong(!)Password';