diff --git a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
index 92068d993f4..d9144f93ae7 100644
--- a/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
+++ b/model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/gensync/TestEditSchema.java
@@ -32,6 +32,7 @@
 import com.evolveum.midpoint.prism.polystring.PolyString;
 import com.evolveum.midpoint.prism.query.ObjectPaging;
 import com.evolveum.midpoint.prism.query.OrderDirection;
+import com.evolveum.midpoint.prism.util.PrismAsserts;
 import com.evolveum.midpoint.prism.util.PrismTestUtil;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.RelationalValueSearchQuery;
@@ -1065,7 +1066,7 @@ public void validate(PrismPropertyDefinition<PolyString> propDef, String name) t
 				assertEquals("Wrong additionalName displayName", "Middle Name", propDef.getDisplayName());
 				assertTrue("additionalName not readable", propDef.canRead());
 			}
-		});
+		}, PrismTestUtil.createPolyString("Jackie"));
 		
 		assertProperty(user, UserType.F_COST_CENTER, new Validator<PrismPropertyDefinition<String>>() {
 			@Override
@@ -1101,12 +1102,20 @@ public void validate(PrismPropertyDefinition<String> propDef, String name) throw
         assertSteadyResources();
     }
 
+	// TODO: Store jack's preferred language and check the schema again
+    
     private <O extends ObjectType, T> void assertProperty(PrismObject<O> object, QName propName,
-			Validator<PrismPropertyDefinition<T>> validator) throws Exception {
+			Validator<PrismPropertyDefinition<T>> validator, T... expectedValues) throws Exception {
 		PrismProperty<T> prop = object.findProperty(propName);
-		PrismPropertyDefinition<T> propDef = prop.getDefinition();
-		assertNotNull("No definition in property "+propName, propDef);
-		validator.validate(propDef, propName.toString());
+		if (expectedValues.length == 0) {
+			assertNull("Unexpected property "+propName+" in "+object+": "+prop, prop);
+		} else {
+			assertNotNull("No property "+propName+" in "+object, prop);
+			PrismAsserts.assertPropertyValue(prop, expectedValues);
+			PrismPropertyDefinition<T> propDef = prop.getDefinition();
+			assertNotNull("No definition in property "+propName, propDef);
+			validator.validate(propDef, propName.toString());
+		}
 		
 		PrismPropertyDefinition<T> objPropDef = object.getDefinition().findPropertyDefinition(propName);
 		assertNotNull("No definition of property "+propName+" in object "+object, objPropDef);