diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerSupplier.java b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
similarity index 77%
rename from test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerSupplier.java
rename to test-poc/framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
index 70ab47291c..17a9117fd6 100644
--- a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/KeycloakTestServerSupplier.java
+++ b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/AbstractKeycloakTestServerSupplier.java
@@ -7,7 +7,7 @@ import org.keycloak.test.framework.injection.Registry;
 import org.keycloak.test.framework.injection.Supplier;
 import org.keycloak.test.framework.injection.SupplierHelpers;
 
-public class KeycloakTestServerSupplier implements Supplier<KeycloakTestServer, KeycloakIntegrationTest> {
+public abstract class AbstractKeycloakTestServerSupplier implements Supplier<KeycloakTestServer, KeycloakIntegrationTest> {
 
     @Override
     public Class<KeycloakTestServer> getValueType() {
@@ -23,8 +23,7 @@ public class KeycloakTestServerSupplier implements Supplier<KeycloakTestServer,
     public InstanceWrapper<KeycloakTestServer, KeycloakIntegrationTest> getValue(Registry registry, KeycloakIntegrationTest annotation) {
         KeycloakTestServerConfig serverConfig = SupplierHelpers.getInstance(annotation.config());
 
-//        RemoteKeycloakTestServer keycloakTestServer = new RemoteKeycloakTestServer();
-        EmbeddedKeycloakTestServer keycloakTestServer = new EmbeddedKeycloakTestServer();
+        KeycloakTestServer keycloakTestServer = getServer();
 
         keycloakTestServer.start(serverConfig);
 
@@ -37,8 +36,10 @@ public class KeycloakTestServerSupplier implements Supplier<KeycloakTestServer,
     }
 
     @Override
-    public void close(KeycloakTestServer remoteKeycloakTestServer) {
-        remoteKeycloakTestServer.stop();
+    public void close(KeycloakTestServer keycloakTestServer) {
+        keycloakTestServer.stop();
     }
 
+    public abstract KeycloakTestServer getServer();
+
 }
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java
new file mode 100644
index 0000000000..2c6b211a3b
--- /dev/null
+++ b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServer.java
@@ -0,0 +1,20 @@
+package org.keycloak.test.framework.server;
+
+public class DistributionKeycloakTestServer implements KeycloakTestServer {
+
+    @Override
+    public void start(KeycloakTestServerConfig serverConfig) {
+        throw new RuntimeException("Method not implemented!");
+    }
+
+    @Override
+    public void stop() {
+        throw new RuntimeException("Method not implemented!");
+    }
+
+    @Override
+    public String getBaseUrl() {
+        return "http://localhost:8080";
+    }
+
+}
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java
new file mode 100644
index 0000000000..52e67eea53
--- /dev/null
+++ b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/DistributionKeycloakTestServerSupplier.java
@@ -0,0 +1,10 @@
+package org.keycloak.test.framework.server;
+
+public class DistributionKeycloakTestServerSupplier extends AbstractKeycloakTestServerSupplier {
+
+    @Override
+    public KeycloakTestServer getServer() {
+        return new DistributionKeycloakTestServer();
+    }
+
+}
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java
new file mode 100644
index 0000000000..ef67e95644
--- /dev/null
+++ b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/EmbeddedKeycloakTestServerSupplier.java
@@ -0,0 +1,10 @@
+package org.keycloak.test.framework.server;
+
+public class EmbeddedKeycloakTestServerSupplier extends AbstractKeycloakTestServerSupplier {
+
+    @Override
+    public KeycloakTestServer getServer() {
+        return new EmbeddedKeycloakTestServer();
+    }
+
+}
diff --git a/test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java
new file mode 100644
index 0000000000..71bf4aa93a
--- /dev/null
+++ b/test-poc/framework/src/main/java/org/keycloak/test/framework/server/RemoteKeycloakTestServerSupplier.java
@@ -0,0 +1,10 @@
+package org.keycloak.test.framework.server;
+
+public class RemoteKeycloakTestServerSupplier extends AbstractKeycloakTestServerSupplier {
+
+    @Override
+    public KeycloakTestServer getServer() {
+        return new RemoteKeycloakTestServer();
+    }
+
+}
diff --git a/test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier b/test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
index 3124ad7f52..f2c780cf0a 100644
--- a/test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
+++ b/test-poc/framework/src/main/resources/META-INF/services/org.keycloak.test.framework.injection.Supplier
@@ -1,6 +1,8 @@
 org.keycloak.test.framework.admin.KeycloakAdminClientSupplier
 org.keycloak.test.framework.realm.ClientSupplier
 org.keycloak.test.framework.realm.RealmSupplier
-org.keycloak.test.framework.server.KeycloakTestServerSupplier
+org.keycloak.test.framework.server.EmbeddedKeycloakTestServerSupplier
+org.keycloak.test.framework.server.DistributionKeycloakTestServerSupplier
+org.keycloak.test.framework.server.RemoteKeycloakTestServerSupplier
 org.keycloak.test.framework.webdriver.ChromeWebDriverSupplier
 org.keycloak.test.framework.webdriver.FirefoxWebDriverSupplier