diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
index 66d46ee1ac8..ebcefccd592 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
@@ -20,7 +20,6 @@ import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.SQLException;
 import java.util.Locale;
-import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import javax.sql.DataSource;
@@ -39,6 +38,7 @@ import org.springframework.util.ClassUtils;
  * @author Dave Syer
  * @author Stephane Nicoll
  * @author Nidhi Desai
+ * @author Moritz Halbritter
  * @since 1.0.0
  * @see #get(ClassLoader)
  */
@@ -47,49 +47,35 @@ public enum EmbeddedDatabaseConnection {
 	/**
 	 * No Connection.
 	 */
-	NONE(null, null, null, (url) -> false),
+	NONE(null),
 
 	/**
 	 * H2 Database Connection.
 	 */
-	H2(EmbeddedDatabaseType.H2, DatabaseDriver.H2.getDriverClassName(),
-			"jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE", (url) -> url.contains(":h2:mem")),
+	H2("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE"),
 
 	/**
 	 * Derby Database Connection.
 	 */
-	DERBY(EmbeddedDatabaseType.DERBY, DatabaseDriver.DERBY.getDriverClassName(), "jdbc:derby:memory:%s;create=true",
-			(url) -> true),
+	DERBY("jdbc:derby:memory:%s;create=true"),
 
 	/**
 	 * HSQL Database Connection.
 	 * @since 2.4.0
 	 */
-	HSQLDB(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
-			"jdbc:hsqldb:mem:%s", (url) -> url.contains(":hsqldb:mem:"));
-
-	private final EmbeddedDatabaseType type;
-
-	private final String driverClass;
+	HSQLDB("org.hsqldb.jdbcDriver", "jdbc:hsqldb:mem:%s");
 
 	private final String alternativeDriverClass;
 
 	private final String url;
 
-	private final Predicate<String> embeddedUrl;
-
-	EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String url,
-			Predicate<String> embeddedUrl) {
-		this(type, driverClass, null, url, embeddedUrl);
+	EmbeddedDatabaseConnection(String url) {
+		this(null, url);
 	}
 
-	EmbeddedDatabaseConnection(EmbeddedDatabaseType type, String driverClass, String fallbackDriverClass, String url,
-			Predicate<String> embeddedUrl) {
-		this.type = type;
-		this.driverClass = driverClass;
+	EmbeddedDatabaseConnection(String fallbackDriverClass, String url) {
 		this.alternativeDriverClass = fallbackDriverClass;
 		this.url = url;
-		this.embeddedUrl = embeddedUrl;
 	}
 
 	/**
@@ -97,7 +83,13 @@ public enum EmbeddedDatabaseConnection {
 	 * @return the driver class name
 	 */
 	public String getDriverClassName() {
-		return this.driverClass;
+		// See https://github.com/spring-projects/spring-boot/issues/32865
+		return switch (this) {
+			case NONE -> null;
+			case H2 -> DatabaseDriver.H2.getDriverClassName();
+			case DERBY -> DatabaseDriver.DERBY.getDriverClassName();
+			case HSQLDB -> DatabaseDriver.HSQLDB.getDriverClassName();
+		};
 	}
 
 	/**
@@ -105,7 +97,13 @@ public enum EmbeddedDatabaseConnection {
 	 * @return the database type
 	 */
 	public EmbeddedDatabaseType getType() {
-		return this.type;
+		// See https://github.com/spring-projects/spring-boot/issues/32865
+		return switch (this) {
+			case NONE -> null;
+			case H2 -> EmbeddedDatabaseType.H2;
+			case DERBY -> EmbeddedDatabaseType.DERBY;
+			case HSQLDB -> EmbeddedDatabaseType.HSQL;
+		};
 	}
 
 	/**
@@ -119,12 +117,18 @@ public enum EmbeddedDatabaseConnection {
 	}
 
 	boolean isEmbeddedUrl(String url) {
-		return this.embeddedUrl.test(url);
+		// See https://github.com/spring-projects/spring-boot/issues/32865
+		return switch (this) {
+			case NONE -> false;
+			case H2 -> url.contains(":h2:mem");
+			case DERBY -> true;
+			case HSQLDB -> url.contains(":hsqldb:mem:");
+		};
 	}
 
 	boolean isDriverCompatible(String driverClass) {
 		return (driverClass != null
-				&& (driverClass.equals(this.driverClass) || driverClass.equals(this.alternativeDriverClass)));
+				&& (driverClass.equals(getDriverClassName()) || driverClass.equals(this.alternativeDriverClass)));
 	}
 
 	/**