diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
index fd2582ac260..9fb12ed56fa 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/security/TestSecurityAdvanced.java
@@ -1193,8 +1193,11 @@ public void test340AutzJackSuperUserAndExecRead() throws Exception {
 		
 		assignRole(USER_JACK_OID, ROLE_SUPERUSER_OID);
 		assignRole(USER_JACK_OID, ROLE_READ_ORG_EXEC_OID);
-				
+		
+		// preconditions
 		assertSearch(UserType.class, createOrgSubtreeQuery(ORG_MINISTRY_OF_OFFENSE_OID), USER_LECHUCK_OID, USER_GUYBRUSH_OID, userCobbOid, USER_ESTEVAN_OID);
+		assertSearch(UserType.class, createOrgSubtreeAndNameQuery(ORG_MINISTRY_OF_OFFENSE_OID, USER_GUYBRUSH_USERNAME), USER_GUYBRUSH_OID);
+		assertSearch(ObjectType.class, createOrgSubtreeAndNameQuery(ORG_MINISTRY_OF_OFFENSE_OID, USER_GUYBRUSH_USERNAME), USER_GUYBRUSH_OID);
 		
 		login(USER_JACK_USERNAME);
 
@@ -1202,11 +1205,21 @@ public void test340AutzJackSuperUserAndExecRead() throws Exception {
 		displayWhen(TEST_NAME);
 
 		assertSearch(UserType.class, createOrgSubtreeQuery(ORG_MINISTRY_OF_OFFENSE_OID), USER_LECHUCK_OID, USER_GUYBRUSH_OID, userCobbOid, USER_ESTEVAN_OID);
+		assertSearch(UserType.class, createOrgSubtreeAndNameQuery(ORG_MINISTRY_OF_OFFENSE_OID, USER_GUYBRUSH_USERNAME), USER_GUYBRUSH_OID);
+		assertSearch(ObjectType.class, createOrgSubtreeAndNameQuery(ORG_MINISTRY_OF_OFFENSE_OID, USER_GUYBRUSH_USERNAME), USER_GUYBRUSH_OID);
 		
 		assertSuperuserAccess(NUMBER_OF_ALL_USERS);
 		
 		assertGlobalStateUntouched();
 	}
+	
+	private ObjectQuery createOrgSubtreeAndNameQuery(String orgOid, String name) {
+		return queryFor(ObjectType.class)
+				.isChildOf(orgOid)
+				.and()
+				.item(ObjectType.F_NAME).eqPoly(name)
+				.build();
+	}
     
     @Override
     protected void cleanupAutzTest(String userOid, int expectedAssignments) throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException, CommunicationException, ConfigurationException, ObjectAlreadyExistsException, PolicyViolationException, SecurityViolationException, IOException {