diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTest.java
index 9f63e721cf..ce79f62ccb 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/AccessBindingTest.java
@@ -41,7 +41,7 @@ import static junit.framework.Assert.assertEquals;
  * @author Hardy Ferentschik
  */
 
-public class AccessBindingTests extends BaseAnnotationBindingTestCase {
+public class AccessBindingTest extends BaseAnnotationBindingTestCase {
 	@Entity
 	class FieldAccess {
 		@Id
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTest.java
similarity index 96%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTest.java
index d56a51acd5..b94774e9be 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/BatchSizeBindingTest.java
@@ -38,7 +38,7 @@ import static junit.framework.Assert.assertEquals;
  *
  * @author Hardy Ferentschik
  */
-public class BatchSizeBindingTests extends BaseAnnotationBindingTestCase {
+public class BatchSizeBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	@Resources(annotatedClasses = NoBatchSizeEntity.class)
 	public void testNoBatchSize() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTest.java
index dd626e429b..4b6bf54199 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CacheBindingTest.java
@@ -45,7 +45,7 @@ import static junit.framework.Assert.assertNull;
  *
  * @author Hardy Ferentschik
  */
-public class CacheBindingTests extends BaseAnnotationBindingTestCase {
+public class CacheBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	@Resources(annotatedClasses = HibernateCacheEntity.class, cacheMode = SharedCacheMode.ALL)
 	public void testHibernateCaching() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTest.java
index 9cdaa8f8d7..935fa511b2 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/CustomSQLBindingTest.java
@@ -46,7 +46,7 @@ import static junit.framework.Assert.assertNull;
  *
  * @author Hardy Ferentschik
  */
-public class CustomSQLBindingTests extends BaseAnnotationBindingTestCase {
+public class CustomSQLBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	@Resources(annotatedClasses = NoCustomSQLEntity.class)
 	public void testNoCustomSqlAnnotations() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTest.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTest.java
index 0f3e390eeb..7cda814ff3 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/EmbeddableBindingTest.java
@@ -44,7 +44,7 @@ import static junit.framework.Assert.assertTrue;
  * @author Hardy Ferentschik
  */
 @FailureExpected(jiraKey = "HHH-6447", message = "Work in progress")
-public class EmbeddableBindingTests extends BaseAnnotationBindingTestCase {
+public class EmbeddableBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	//@Resources(annotatedClasses = { User.class, Address.class })
 	public void testEmbeddable() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTest.java
similarity index 98%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTest.java
index 4889adbde4..74f905d6dd 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/MappedSuperclassTest.java
@@ -49,7 +49,7 @@ import static junit.framework.Assert.assertTrue;
  * @author Hardy Ferentschik
  */
 @FailureExpected(jiraKey = "HHH-6447", message = "Work in progress")
-public class MappedSuperclassTests extends BaseAnnotationBindingTestCase {
+public class MappedSuperclassTest extends BaseAnnotationBindingTestCase {
 	@Test
 //	@Resources(annotatedClasses = { MyMappedSuperClass.class, MyEntity.class, MyMappedSuperClassBase.class })
 	public void testSimpleAttributeOverrideInMappedSuperclass() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTest.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTest.java
index 1bc29a6049..fd425ba2f6 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/ProxyBindingTest.java
@@ -40,7 +40,7 @@ import static junit.framework.Assert.assertTrue;
  *
  * @author Hardy Ferentschik
  */
-public class ProxyBindingTests extends BaseAnnotationBindingTestCase {
+public class ProxyBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	@Resources(annotatedClasses = ProxiedEntity.class)
 	public void testProxyNoAttributes() {
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTest.java
similarity index 95%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTest.java
index b676377431..0a8e948c3c 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/QuotedIdentifierTest.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Strong Liu
  */
-public class QuotedIdentifierTests extends BaseAnnotationBindingTestCase {
+public class QuotedIdentifierTest extends BaseAnnotationBindingTestCase {
 	private final String ormPath = "org/hibernate/metamodel/source/annotations/xml/orm-quote-identifier.xml";
 
 	@Test
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTests.java b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTest.java
similarity index 97%
rename from hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTests.java
rename to hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTest.java
index b3febf8b69..ac51759f03 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTests.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/source/annotations/entity/UniqueConstraintBindingTest.java
@@ -45,7 +45,7 @@ import static junit.framework.Assert.assertTrue;
  *
  * @author Strong Liu
  */
-public class UniqueConstraintBindingTests extends BaseAnnotationBindingTestCase {
+public class UniqueConstraintBindingTest extends BaseAnnotationBindingTestCase {
 	@Test
 	@Resources(annotatedClasses = TableWithUniqueConstraint.class)
 	public void testTableUniqueConstraints() {