diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java
index ef8cca07d0..7f4d6d41b5 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/BasicAnnotationBindingTests.java
@@ -28,11 +28,16 @@ import org.hibernate.metamodel.source.internal.MetadataImpl;
 
 import org.hibernate.testing.FailureExpected;
 
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static org.junit.Assert.assertSame;
+
 /**
  * Basic tests of annotation based binding code
  *
  * @author Hardy Ferentschik
  */
+@FailureExpected( jiraKey = "HHH-6495" )
 public class BasicAnnotationBindingTests extends AbstractBasicBindingTests {
 	@Override
 	public void addSourcesForSimpleEntityBinding(MetadataSources sources) {
@@ -53,10 +58,4 @@ public class BasicAnnotationBindingTests extends AbstractBasicBindingTests {
 	public void addSourcesForComponentBinding(MetadataSources sources) {
 		sources.addAnnotatedClass(  SimpleEntityWithSimpleComponent.class );
 	}
-
-	@Override
-	@FailureExpected( jiraKey = "HHH-6495" )
-	public void testSimpleEntityWithSimpleComponentMapping() {
-		super.testSimpleEntityWithSimpleComponentMapping();
-	}
 }
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleEntityWithSimpleComponent.java b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleEntityWithSimpleComponent.java
index 1ae7cd8901..1fb5ec9854 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleEntityWithSimpleComponent.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/binding/SimpleEntityWithSimpleComponent.java
@@ -24,6 +24,7 @@
 package org.hibernate.metamodel.binding;
 
 import javax.persistence.Embeddable;
+import javax.persistence.Embedded;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
@@ -35,6 +36,7 @@ public class SimpleEntityWithSimpleComponent {
 	@Id
 	private Long id;
 	private String name;
+	@Embedded
 	private SimpleComponent simpleComponent;
 
 	public SimpleEntityWithSimpleComponent() {