diff --git a/Repository/Tests/BaseTest.php b/Repository/Tests/BaseTest.php
index 1b342e8ca..d070e7056 100644
--- a/Repository/Tests/BaseTest.php
+++ b/Repository/Tests/BaseTest.php
@@ -598,7 +598,7 @@ public function createUserWithPolicies($login, array $policiesData)
             $userCreateStruct->setField('last_name', $login);
             $user = $userService->createUser($userCreateStruct, [$userService->loadUserGroup(4)]);
 
-            $role = $this->createRoleWithPolicies(uniqid('role_for_' . $login . '_'), $policiesData);
+            $role = $this->createRoleWithPolicies(uniqid('role_for_' . $login . '_', true), $policiesData);
             $roleService->assignRoleToUser($role, $user);
 
             $repository->commit();
diff --git a/Repository/Tests/FieldType/KeywordIntegrationTest.php b/Repository/Tests/FieldType/KeywordIntegrationTest.php
index 22729105f..2b9c2f6c7 100644
--- a/Repository/Tests/FieldType/KeywordIntegrationTest.php
+++ b/Repository/Tests/FieldType/KeywordIntegrationTest.php
@@ -416,8 +416,8 @@ private function assertContentFieldHasCorrectData($contentId, KeywordValue $valu
     public function testKeywordsAreCaseSensitive()
     {
         $contentType = $this->testCreateContentType();
-        $publishedContent01 = $this->createAndPublishContent('Foo', $contentType, md5(uniqid() . microtime()));
-        $publishedContent02 = $this->createAndPublishContent('foo', $contentType, md5(uniqid() . microtime()));
+        $publishedContent01 = $this->createAndPublishContent('Foo', $contentType, md5(uniqid(__METHOD__, true)));
+        $publishedContent02 = $this->createAndPublishContent('foo', $contentType, md5(uniqid(__METHOD__, true)));
 
         $data = $publishedContent01->getField('data')->value;
         $this->assertCount(1, $data->values);