diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/Postgresql13DatabaseIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java
similarity index 90%
rename from sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/Postgresql13DatabaseIT.java
rename to sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java
index 966b3a1ca7..19dc5ed9fb 100644
--- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/Postgresql13DatabaseIT.java
+++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/PostgresqlDatabaseIT.java
@@ -7,12 +7,12 @@
 import io.quarkus.test.services.QuarkusApplication;
 
 @QuarkusScenario
-public class Postgresql13DatabaseIT extends AbstractReactiveDatabaseIT {
+public class PostgresqlDatabaseIT extends AbstractReactiveDatabaseIT {
 
     private static final String POSTGRES_USER = "quarkus_test";
     private static final String POSTGRES_PASSWORD = "quarkus_test";
     private static final String POSTGRES_DATABASE = "quarkus_test";
-    static final int POSTGRES_PORT = 5432;
+    private static final int POSTGRES_PORT = 5432;
 
     @Container(image = "${postgresql.13.image}", port = POSTGRES_PORT, expectedLog = "listening on IPv4 address")
     static PostgresqlService database = new PostgresqlService()
diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql12IT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql12IT.java
deleted file mode 100644
index 78d9bdac32..0000000000
--- a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresql12IT.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package io.quarkus.ts.reactive.openshift;
-
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
-
-import io.quarkus.test.bootstrap.PostgresqlService;
-import io.quarkus.test.bootstrap.RestService;
-import io.quarkus.test.scenarios.OpenShiftScenario;
-import io.quarkus.test.services.Container;
-import io.quarkus.test.services.QuarkusApplication;
-import io.quarkus.ts.reactive.AbstractReactiveDatabaseIT;
-
-@OpenShiftScenario
-@EnabledIfSystemProperty(named = "ts.redhat.registry.enabled", matches = "true")
-//TODO: enable disabled methods then the issue will be fixed
-public class OpenShiftPostgresql12IT extends AbstractReactiveDatabaseIT {
-
-    private static final String POSTGRES_USER = "quarkus_test";
-    private static final String POSTGRES_PASSWORD = "quarkus_test";
-    private static final String POSTGRES_DATABASE = "quarkus_test";
-    private static final int POSTGRES_PORT = 5432;
-
-    @Container(image = "${postgresql.12.image}", port = POSTGRES_PORT, expectedLog = "listening on IPv4 address")
-    static PostgresqlService database = new PostgresqlService()
-            .withUser(POSTGRES_USER)
-            .withPassword(POSTGRES_PASSWORD)
-            .withDatabase(POSTGRES_DATABASE);
-
-    @QuarkusApplication
-    static RestService app = new RestService().withProperties("postgresql.properties")
-            .withProperty("quarkus.datasource.username", POSTGRES_USER)
-            .withProperty("quarkus.datasource.password", POSTGRES_PASSWORD)
-            .withProperty("quarkus.datasource.reactive.url", database::getReactiveUrl);
-
-    @Override
-    protected RestService getApp() {
-        return app;
-    }
-
-    @Override
-    @Disabled("https://github.com/quarkusio/quarkus/issues/21700")
-    public void connectToUniEndpoint() {
-    }
-
-    @Override
-    @Disabled("https://github.com/quarkusio/quarkus/issues/21700")
-    public void connectToMultiEndpoint() {
-    }
-}
diff --git a/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java
new file mode 100644
index 0000000000..aa9fbce921
--- /dev/null
+++ b/sql-db/hibernate-reactive/src/test/java/io/quarkus/ts/reactive/openshift/OpenShiftPostgresqlIT.java
@@ -0,0 +1,20 @@
+package io.quarkus.ts.reactive.openshift;
+
+import org.junit.jupiter.api.Disabled;
+
+import io.quarkus.test.scenarios.OpenShiftScenario;
+import io.quarkus.ts.reactive.PostgresqlDatabaseIT;
+
+@OpenShiftScenario
+//TODO: enable disabled methods then the issue will be fixed
+public class OpenShiftPostgresqlIT extends PostgresqlDatabaseIT {
+    @Override
+    @Disabled("https://github.com/quarkusio/quarkus/issues/21700")
+    public void connectToUniEndpoint() {
+    }
+
+    @Override
+    @Disabled("https://github.com/quarkusio/quarkus/issues/21700")
+    public void connectToMultiEndpoint() {
+    }
+}