diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
index 2d154e2046..fb58ae86d8 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/reflection/JPAOverridenAnnotationReaderTest.java
@@ -17,6 +17,7 @@ import javax.persistence.DiscriminatorValue;
 import javax.persistence.Embedded;
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
+import javax.persistence.EntityListeners;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
 import javax.persistence.ExcludeDefaultListeners;
@@ -39,6 +40,9 @@ import javax.persistence.NamedQueries;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
 import javax.persistence.OrderBy;
+import javax.persistence.PostLoad;
+import javax.persistence.PostPersist;
+import javax.persistence.PrePersist;
 import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.PrimaryKeyJoinColumns;
 import javax.persistence.SecondaryTable;
@@ -51,28 +55,56 @@ import javax.persistence.Temporal;
 import javax.persistence.TemporalType;
 import javax.persistence.Transient;
 import javax.persistence.Version;
-import javax.persistence.PrePersist;
-import javax.persistence.EntityListeners;
-import javax.persistence.PostLoad;
-import javax.persistence.PostPersist;
 
-import junit.framework.TestCase;
 import org.dom4j.DocumentException;
 import org.dom4j.io.SAXReader;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.SAXNotSupportedException;
+
 import org.hibernate.annotations.Columns;
 import org.hibernate.cfg.EJB3DTDEntityResolver;
 import org.hibernate.cfg.annotations.reflection.JPAOverridenAnnotationReader;
 import org.hibernate.cfg.annotations.reflection.XMLContext;
+import org.hibernate.testing.junit.functional.annotations.HibernateTestCase;
 import org.hibernate.util.XMLHelper;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXNotSupportedException;
 
 
 /**
  * @author Emmanuel Bernard
  */
-public class JPAOverridenAnnotationReaderTest extends TestCase {
+public class JPAOverridenAnnotationReaderTest extends HibernateTestCase {
+
+	@Override
+	protected void buildConfiguration() throws Exception {
+		//Do nothing
+	}
+
+	@Override
+	protected void runSchemaGeneration() {
+		//Do nothing
+	}
+
+	@Override
+	protected void runSchemaDrop() {
+		//Do nothing
+	}
+
+	@Override
+	protected void handleUnclosedResources() {
+		//Do nothing
+	}
+
+	@Override
+	protected void closeResources() {
+		//Do nothing
+	}
+
+	@Override
+	protected Class<?>[] getAnnotatedClasses() {
+		return new Class<?>[0];
+	}
+
 	public void testMappedSuperclassAnnotations() throws Exception {
 		XMLContext context = buildContext(
 				"org/hibernate/test/annotations/reflection/metadata-complete.xml"
@@ -403,7 +435,7 @@ public class JPAOverridenAnnotationReaderTest extends TestCase {
 		assertFalse( reader.isAnnotationPresent( PostPersist.class ) );
 
 		assertEquals( 1, context.getDefaultEntityListeners().size() );
-		assertEquals( OtherLogListener.class.getName(), context.getDefaultEntityListeners().get(0) );
+		assertEquals( OtherLogListener.class.getName(), context.getDefaultEntityListeners().get( 0 ) );
 	}
 
 	private XMLContext buildContext(String ormfile) throws SAXException, DocumentException, IOException {
@@ -418,7 +450,7 @@ public class JPAOverridenAnnotationReaderTest extends TestCase {
 		try {
 			saxReader.setFeature( "http://apache.org/xml/features/validation/schema", true );
 		}
-		catch (SAXNotSupportedException e) {
+		catch ( SAXNotSupportedException e ) {
 			saxReader.setValidation( false );
 		}
 		org.dom4j.Document doc;
@@ -429,7 +461,7 @@ public class JPAOverridenAnnotationReaderTest extends TestCase {
 		finally {
 			is.close();
 		}
-		if (errors.size() > 0) {
+		if ( errors.size() > 0 ) {
 			System.out.println( errors.get( 0 ) );
 		}
 		assertEquals( 0, errors.size() );
diff --git a/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
index 880a3d13c6..f4382e793b 100644
--- a/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
+++ b/testsuite/src/test/java/org/hibernate/test/annotations/xml/ejb3/Ejb3XmlTestCase.java
@@ -63,6 +63,11 @@ abstract class Ejb3XmlTestCase extends HibernateTestCase {
 		//Do nothing
 	}
 
+	@Override
+	protected void closeResources() {
+		//Do nothing
+	}
+
 	@Override
 	protected Class<?>[] getAnnotatedClasses() {
 		return new Class<?>[0];