diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
index d9cfa8b7db9..d6171c002c7 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/CompilationStatement.java
@@ -100,6 +100,9 @@ private List<File> getCompilationUnits(List<Class<?>> classesToCompile, List<Str
 	}
 
 	private String getPathToSource(Class<?> testClass) {
+		if ( testClass.isMemberClass() ) {
+			return getPathToSource( testClass.getDeclaringClass() );
+		}
 		return TestUtil.getSourceBaseDir( testClass ).getAbsolutePath() + File.separator + testClass.getName()
 				.replace( PACKAGE_SEPARATOR, File.separator ) + ".java";
 	}
diff --git a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
index 39f6559cf09..8e35ea10210 100644
--- a/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
+++ b/tooling/metamodel-generator/src/test/java/org/hibernate/processor/test/util/TestUtil.java
@@ -335,6 +335,9 @@ public static Class<?> getMetamodelClassFor(String className) {
 	}
 
 	public static File getMetaModelSourceFileFor(Class<?> clazz, boolean prefix) {
+		if ( clazz.isMemberClass() ) {
+			return getMetaModelSourceFileFor( clazz.getEnclosingClass(), prefix );
+		}
 		String metaModelClassName = getMetaModelClassName(clazz, prefix);
 		// generate the file name
 		String fileName = metaModelClassName.replace( PACKAGE_SEPARATOR, PATH_SEPARATOR );
@@ -351,13 +354,17 @@ public static File getMetaModelSourceFileFor(String className) {
 	}
 
 	private static String getMetaModelClassName(Class<?> clazz, boolean prefix) {
-		return prefix
-				? clazz.getPackageName() + '.' + META_MODEL_CLASS_POSTFIX + clazz.getSimpleName()
-				: clazz.getName() + META_MODEL_CLASS_POSTFIX;
+		final String packageName = clazz.getPackageName();
+		return prefix ? packageName + '.' + META_MODEL_CLASS_POSTFIX + clazz.getName().substring( packageName.length() + 1 )
+				.replaceAll( "\\$", "\\$_" )
+				: packageName + clazz.getName().substring( packageName.length() )
+						.replaceAll( "\\$", "_\\$" ) + META_MODEL_CLASS_POSTFIX;
 	}
 
 	private static String getMetaModelClassName(String className) {
-		return className + META_MODEL_CLASS_POSTFIX;
+		final int index = className.lastIndexOf( '.' );
+		final String packageName = className.substring( 0, index + 1 );
+		return packageName + className.substring( packageName.length() ).replaceAll( "\\$", "_\\$" ) + META_MODEL_CLASS_POSTFIX;
 	}
 
 	public static String getMetaModelSourceAsString(Class<?> clazz) {