diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
index ad4f758c3c..29b819358c 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/EnumIdTest.java
@@ -30,7 +30,6 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.test.annotations.id.entities.Planet;
 import org.hibernate.test.annotations.id.entities.PlanetCheatSheet;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
@@ -49,7 +48,6 @@ public class EnumIdTest extends BaseCoreFunctionalTestCase {
 	private static final Logger log = Logger.getLogger( EnumIdTest.class );
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testEnumAsId() throws Exception {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
index 2617892ba5..0934d78d9d 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/id/sequences/EnumIdTest.java
@@ -30,7 +30,6 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.test.annotations.id.sequences.entities.Planet;
 import org.hibernate.test.annotations.id.sequences.entities.PlanetCheatSheet;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.TestForIssue;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
@@ -49,7 +48,6 @@ public class EnumIdTest extends BaseCoreFunctionalTestCase {
 	private static final Logger log = Logger.getLogger( EnumIdTest.class );
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testEnumAsId() throws Exception {
 		Session s = openSession();
 		Transaction tx = s.beginTransaction();
diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java
index b6570d5b48..722f97dbe7 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/various/OptimisticLockAnnotationTest.java
@@ -26,7 +26,6 @@ package org.hibernate.test.annotations.various;
 import org.junit.Test;
 
 import org.hibernate.Session;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
 
 import static org.junit.Assert.assertEquals;
@@ -39,7 +38,6 @@ import static org.junit.Assert.assertEquals;
 public class OptimisticLockAnnotationTest extends BaseCoreFunctionalTestCase {
 
 	@Test
-	@FailureExpectedWithNewMetamodel
 	public void testOptimisticLockExcludeOnNameProperty() throws Exception {
 		Conductor c = new Conductor();
 		c.setName( "Bob" );
diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
index fdf217835b..ba599b4032 100644
--- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
+++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionFactoryImpl.java
@@ -6,12 +6,10 @@ import java.util.Map;
 import org.hibernate.cache.ehcache.EhCacheRegionFactory;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 
 /**
  * @author Alex Snaps
  */
-@FailureExpectedWithNewMetamodel
 public class EhCacheRegionFactoryImpl extends EhCacheTest {
 
 	@Override
diff --git a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
index dc4e369f8b..7e81124210 100644
--- a/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
+++ b/hibernate-ehcache/src/test/java/org/hibernate/test/cache/ehcache/EhCacheRegionTest.java
@@ -6,12 +6,10 @@ import org.hibernate.cache.ehcache.EhCacheRegionFactory;
 import org.hibernate.cache.ehcache.internal.strategy.ItemValueExtractor;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.cfg.Environment;
-import org.hibernate.testing.FailureExpectedWithNewMetamodel;
 
 /**
  * @author Alex Snaps
  */
-@FailureExpectedWithNewMetamodel
 public class EhCacheRegionTest extends EhCacheTest {
 	@Override
 	protected void configCache(final Configuration cfg) {