diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableBindingTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableBindingTest.java
index dca8bac49b..5b8ef15bb9 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/EmbeddableBindingTest.java
@@ -80,7 +80,7 @@ public class EmbeddableBindingTest extends BaseAnnotationBindingTestCase {
 		// todo - is this really correct? Does the path start w/ the class name
 		assertEquals(
 				"Wrong path",
-				"org.hibernate.metamodel.source.annotations.entity.EmbeddableBindingTest$User.phone",
+				EmbeddableBindingTest.User.class.getName() + ".phone",
 				componentBinding.getPathBase()
 		);
 
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
index 5adaac8bfb..e1a25b5092 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/MapsIdTest.java
@@ -86,7 +86,7 @@ public class MapsIdTest extends BaseAnnotationBindingTestCase {
 			);
 			assertEquals(
 					"Wrong error origin",
-					"org.hibernate.metamodel.source.annotations.entity.MapsIdTest$Dependent",
+					MapsIdTest.Dependent.class.getName(),
 					e.getOrigin().getName()
 			);
 		}
diff --git a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/ProxyBindingTest.java b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/ProxyBindingTest.java
index 10c92ef0d7..7bf201c9d6 100644
--- a/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/ProxyBindingTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/metamodel/internal/source/annotations/entity/ProxyBindingTest.java
@@ -72,7 +72,7 @@ public class ProxyBindingTest extends BaseAnnotationBindingTestCase {
 		assertTrue( "Wrong laziness", binding.isLazy() );
 		assertEquals(
 				"Wrong proxy interface",
-				"org.hibernate.metamodel.source.annotations.entity.ProxyBindingTest$ProxyInterfaceEntity",
+				ProxyBindingTest.ProxyInterfaceEntity.class.getName(),
 				binding.getProxyInterfaceType().getValue().getName()
 		);
 	}