diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntity.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntity.java
new file mode 100644
index 000000000000..d6e5db8c8eeb
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntity.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.generic;
+
+import jakarta.persistence.Entity;
+
+@Entity
+public class MyActualEntity extends MyMappedSuperclass<Integer> {
+	public String myString;
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntityRepository.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntityRepository.java
new file mode 100644
index 000000000000..83001da8657b
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyActualEntityRepository.java
@@ -0,0 +1,12 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.generic;
+
+import jakarta.data.repository.CrudRepository;
+import jakarta.data.repository.Repository;
+
+@Repository
+public interface MyActualEntityRepository extends CrudRepository<MyActualEntity, Integer> {
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclass.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclass.java
new file mode 100644
index 000000000000..74c3bc9754b1
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclass.java
@@ -0,0 +1,17 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.generic;
+
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+
+import java.io.Serializable;
+
+@MappedSuperclass
+public class MyMappedSuperclass<ID extends Serializable> {
+	@Id
+	private ID id;
+
+}
diff --git a/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclassTest.java b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclassTest.java
new file mode 100644
index 000000000000..967b7ef7ed38
--- /dev/null
+++ b/tooling/metamodel-generator/src/jakartaData/java/org/hibernate/processor/test/data/generic/MyMappedSuperclassTest.java
@@ -0,0 +1,25 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * Copyright Red Hat Inc. and Hibernate Authors
+ */
+package org.hibernate.processor.test.data.generic;
+
+import org.hibernate.processor.test.util.CompilationTest;
+import org.hibernate.processor.test.util.TestUtil;
+import org.hibernate.processor.test.util.WithClasses;
+import org.junit.jupiter.api.Test;
+
+import static org.hibernate.processor.test.util.TestUtil.assertMetamodelClassGeneratedFor;
+
+@CompilationTest
+public class MyMappedSuperclassTest {
+
+	@Test
+	@WithClasses({MyActualEntity.class, MyActualEntityRepository.class, MyMappedSuperclass.class})
+	void smoke() {
+		System.out.println( TestUtil.getMetaModelSourceAsString( MyMappedSuperclass.class ) );
+		System.out.println( TestUtil.getMetaModelSourceAsString( MyActualEntity.class ) );
+		assertMetamodelClassGeneratedFor( MyMappedSuperclass.class );
+		assertMetamodelClassGeneratedFor( MyActualEntity.class );
+	}
+}