diff --git a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
index 7565e82099c..f3c45fc2fa2 100644
--- a/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
+++ b/spring-context/src/main/java/org/springframework/validation/beanvalidation/SpringValidatorAdapter.java
@@ -130,7 +130,8 @@ public class SpringValidatorAdapter implements SmartValidator, javax.validation.
 						}
 						else {
 							Object invalidValue = violation.getInvalidValue();
-							if (field.contains(".") && !field.contains("[]")) {
+							if (!"".equals(field) && (invalidValue == violation.getLeafBean() ||
+									(field.contains(".") && !field.contains("[]")))) {
 								// Possibly a bean constraint with property path: retrieve the actual property value.
 								// However, explicitly avoid this for "address[]" style paths that we can't handle.
 								invalidValue = bindingResult.getRawFieldValue(field);
diff --git a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
index f28b7e35bd0..be4f45213a0 100644
--- a/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
+++ b/spring-context/src/test/java/org/springframework/validation/beanvalidation/ValidatorFactoryTests.java
@@ -35,7 +35,6 @@ import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 import org.hibernate.validator.HibernateValidator;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.validation.BeanPropertyBindingResult;
@@ -43,7 +42,7 @@ import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.ObjectError;
 
-import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 /**
@@ -105,7 +104,6 @@ public class ValidatorFactoryTests {
 	}
 
 	@Test
-	@Ignore
 	public void testSpringValidationFieldType() throws Exception {
 		LocalValidatorFactoryBean validator = new LocalValidatorFactoryBean();
 		validator.afterPropertiesSet();
@@ -115,8 +113,7 @@ public class ValidatorFactoryTests {
 		BeanPropertyBindingResult errors = new BeanPropertyBindingResult(person, "person");
 		validator.validate(person, errors);
 		assertEquals(1, errors.getErrorCount());
-		assertThat("Field/Value type missmatch",
-				errors.getFieldError("address").getRejectedValue(),
+		assertThat("Field/Value type mismatch", errors.getFieldError("address").getRejectedValue(),
 				instanceOf(ValidAddress.class));
 	}