diff --git a/pom.xml b/pom.xml
index 5fd9a5d1..f7705026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,7 +217,7 @@
 		<dependency>
 			<groupId>com.oracle.database.jdbc</groupId>
 			<artifactId>ojdbc11</artifactId>
-			<version>21.1.0.0</version>
+			<version>21.4.0.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
index 0611201e..cf7ae9da 100644
--- a/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
+++ b/src/test/java/org/springframework/data/r2dbc/testing/OracleTestSupport.java
@@ -55,7 +55,7 @@ public class OracleTestSupport {
 			+ "    id          INTEGER GENERATED by default on null as IDENTITY PRIMARY KEY,\n" //
 			+ "    version     INTEGER NULL,\n" //
 			+ "    name        VARCHAR2(255) NOT NULL,\n" //
-			+ "    flag        Boolean NULL,\n" //
+			+ "    flag        INTEGER NULL,\n" //
 			+ "    manual      INTEGER NULL\n" //
 			+ ")";
 
@@ -65,6 +65,7 @@ public class OracleTestSupport {
 			+ "    \"Manual\"      INTEGER NULL\n" //
 			+ ")";
 	public static final String DROP_TABLE_LEGOSET_WITH_MIXED_CASE_NAMES = "DROP TABLE \"LegoSet\"";
+
 	/**
 	 * Returns a database either hosted locally or running inside Docker.
 	 *
@@ -162,9 +163,9 @@ public class OracleTestSupport {
 
 		DriverManagerDataSource dataSource = new DriverManagerDataSource();
 
+		dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1"));
 		dataSource.setUsername(database.getUsername());
 		dataSource.setPassword(database.getPassword());
-		dataSource.setUrl(database.getJdbcUrl().replace(":xe", "/XEPDB1"));
 
 		return dataSource;
 	}