diff --git a/hibernate-agroal/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-agroal/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-agroal/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-c3p0/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-c3p0/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-c3p0/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-community-dialects/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-community-dialects/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-community-dialects/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-core/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-core/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-core/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
index bb9d0e4fd4..77450a2baf 100644
--- a/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
+++ b/hibernate-envers/src/test/java/org/hibernate/orm/test/envers/AbstractEnversTest.java
@@ -26,10 +26,6 @@ import org.jboss.logging.Logger;
 @RunWith(EnversRunner.class)
 public abstract class AbstractEnversTest {
 
-	static {
-		DatabaseCleaner.clearSchemas();
-	}
-
 	protected final Logger log = Logger.getLogger( getClass() );
 
 	private String auditStrategy;
diff --git a/hibernate-envers/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-envers/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-envers/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-hikaricp/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-hikaricp/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-hikaricp/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-jcache/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-jcache/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-jcache/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-jfr/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-jfr/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-jfr/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-micrometer/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-micrometer/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-micrometer/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-spatial/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-spatial/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-spatial/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
index 62b17ec8d9..0ec122aae6 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/bytecode/enhancement/extension/engine/BytecodeEnhancedTestEngine.java
@@ -62,13 +62,6 @@ public class BytecodeEnhancedTestEngine extends HierarchicalTestEngine<JupiterEn
 
 	@Override
 	public TestDescriptor discover(EngineDiscoveryRequest discoveryRequest, UniqueId uniqueId) {
-		// Make sure this runs first
-		try {
-			BaseUnitTestCase.checkClearSchema();
-		}
-		catch (Throwable e) {
-			throw new RuntimeException( e );
-		}
 		JupiterConfiguration configuration = new CachingJupiterConfiguration(
 				new DefaultJupiterConfiguration( discoveryRequest.getConfigurationParameters() ) );
 		JupiterEngineDescriptor engineDescriptor = new BytecodeEnhancedEngineDescriptor( uniqueId, configuration );
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
index e8ab6c4dfe..099807d5fe 100644
--- a/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/junit4/BaseUnitTestCase.java
@@ -16,8 +16,6 @@ import jakarta.transaction.SystemException;
 import org.hibernate.engine.transaction.internal.jta.JtaStatusHelper;
 
 import org.hibernate.testing.AfterClassOnce;
-import org.hibernate.testing.BeforeClassOnce;
-import org.hibernate.testing.cleaner.DatabaseCleaner;
 import org.hibernate.testing.jdbc.leak.ConnectionLeakUtil;
 import org.hibernate.testing.jta.TestingJtaPlatformImpl;
 import org.junit.After;
@@ -36,24 +34,6 @@ import org.jboss.logging.Logger;
 @RunWith( CustomRunner.class )
 public abstract class BaseUnitTestCase {
 
-	private static Throwable schemaClearError;
-
-	static {
-		try {
-			DatabaseCleaner.clearSchemas();
-		}
-		catch (Throwable t) {
-			schemaClearError = t;
-		}
-	}
-
-	@BeforeClassOnce
-	public static void checkClearSchema() throws Throwable {
-		if (schemaClearError!=null) {
-			throw schemaClearError;
-		}
-	}
-
 	protected final Logger log = Logger.getLogger( getClass() );
 
 	private static boolean enableConnectionLeakDetection = Boolean.TRUE.toString()
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java b/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java
new file mode 100644
index 0000000000..82cd048eae
--- /dev/null
+++ b/hibernate-testing/src/main/java/org/hibernate/testing/schema/CheckClearSchemaListener.java
@@ -0,0 +1,27 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * License: GNU Lesser General Public License (LGPL), version 2.1 or later.
+ * See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ */
+package org.hibernate.testing.schema;
+
+import org.hibernate.testing.cleaner.DatabaseCleaner;
+import org.junit.platform.launcher.LauncherSession;
+import org.junit.platform.launcher.LauncherSessionListener;
+
+/**
+ * This listener should be called before the discovery request is sent to the test engines.
+ * <p>
+ * Note, it is on purpose not registered as a service within the {@code hibernate-testing} (i.e. in {@code META-INF/services} of this jar).
+ * This is to prevent this listener be invoked by non Hibernate ORM users of the {@code hibernate-testing} lib.
+ * <p>
+ * See also <a href="https://junit.org/junit5/docs/current/user-guide/#launcher-api-launcher-session-listeners-tool-example-usage">...</a>
+ */
+public class CheckClearSchemaListener implements LauncherSessionListener {
+
+	@Override
+	public void launcherSessionOpened(LauncherSession session) {
+		DatabaseCleaner.clearSchemas();
+	}
+}
diff --git a/hibernate-vector/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener b/hibernate-vector/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
new file mode 100644
index 0000000000..8f96f0a8e1
--- /dev/null
+++ b/hibernate-vector/src/test/resources/META-INF/services/org.junit.platform.launcher.LauncherSessionListener
@@ -0,0 +1 @@
+org.hibernate.testing.schema.CheckClearSchemaListener