diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java
index 69c78cc491..138c3cdd12 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/NotNullSchemaConstraint.java
@@ -69,7 +69,7 @@ public boolean applyConstraint(AttributeBinding attributeBinding, ConstraintDesc
 			return false;
 		}
 
-		EntityBinding entityBinding = (EntityBinding) attributeBinding.getContainer();
+		EntityBinding entityBinding = attributeBinding.getContainer().seekEntityBinding();
 		InheritanceType inheritanceType = entityBinding.getHierarchyDetails().getInheritanceType();
 
 		// properties of a single table inheritance configuration should not be forced to null
diff --git a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/SchemaModificationHelper.java b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/SchemaModificationHelper.java
index d74903164a..c31a2fcb6c 100644
--- a/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/SchemaModificationHelper.java
+++ b/hibernate-core/src/main/java/org/hibernate/cfg/beanvalidation/ddl/SchemaModificationHelper.java
@@ -29,6 +29,7 @@
 import org.hibernate.metamodel.spi.binding.AttributeBinding;
 import org.hibernate.metamodel.spi.binding.BasicAttributeBinding;
 import org.hibernate.metamodel.spi.binding.RelationalValueBinding;
+import org.hibernate.metamodel.spi.binding.SingularAttributeBinding;
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.Value;
 
@@ -55,12 +56,12 @@ public static String buildSQLCheck(String existingCheckCondition, String checkCo
 	}
 
 	public static Column getSingleColumn(AttributeBinding attributeBinding) {
-		if ( !( attributeBinding instanceof BasicAttributeBinding ) ) {
+		if ( !( attributeBinding instanceof SingularAttributeBinding ) ) {
 			// TODO verify that's correct (HF)
 			return null;
 		}
 
-		BasicAttributeBinding basicAttributeBinding = ( BasicAttributeBinding ) attributeBinding;
+		SingularAttributeBinding basicAttributeBinding = ( SingularAttributeBinding ) attributeBinding;
 		RelationalValueBinding valueBinding = basicAttributeBinding.getRelationalValueBindings().get( 0 );
 		Value value = valueBinding.getValue();
 
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
index 2a4169158e..b724d778db 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/beanvalidation/DDLTest.java
@@ -28,7 +28,6 @@
 import org.hibernate.metamodel.spi.relational.Column;
 import org.hibernate.metamodel.spi.relational.PrimaryKey;
 import org.hibernate.test.util.SchemaUtil;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
@@ -66,7 +65,6 @@ public void testLengthConstraint() throws Exception {
 		assertEquals( column.getSize().getLength(), 5 );
 	}
 
-	@FailureExpectedWithNewMetamodel
 	@Test
 	public void testApplyOnManyToOne() throws Exception {
 		Column column = SchemaUtil.getColumn( TvOwner.class, "tv_serial", metadata() );