diff --git a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java
index 7c30df55129..69387266b26 100644
--- a/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java
+++ b/test-framework/examples/tests/src/test/java/org/keycloak/test/examples/RunOnServerTest.java
@@ -10,8 +10,8 @@ import org.keycloak.testframework.annotations.InjectRealm;
 import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
 import org.keycloak.testframework.realm.ManagedRealm;
 import org.keycloak.testframework.remote.providers.runonserver.RunOnServerException;
-import org.keycloak.testframework.runonserver.InjectRunOnServer;
-import org.keycloak.testframework.runonserver.RunOnServerClient;
+import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
+import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
 import org.opentest4j.AssertionFailedError;
 
 @KeycloakIntegrationTest
diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProvider.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java
similarity index 95%
rename from test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProvider.java
rename to test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java
index e6abb1d0cac..efb5f23c4c9 100644
--- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProvider.java
+++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProvider.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.remote.providers;
+package org.keycloak.testframework.remote.providers.timeoffset;
 
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.GET;
diff --git a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProviderFactory.java b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProviderFactory.java
similarity index 92%
rename from test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProviderFactory.java
rename to test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProviderFactory.java
index bfb9a6fe604..53ae1f9dca0 100644
--- a/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/TimeOffSetRealmResourceProviderFactory.java
+++ b/test-framework/remote-providers/src/main/java/org/keycloak/testframework/remote/providers/timeoffset/TimeOffSetRealmResourceProviderFactory.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.remote.providers;
+package org.keycloak.testframework.remote.providers.timeoffset;
 
 import org.keycloak.models.KeycloakSession;
 import org.keycloak.models.KeycloakSessionFactory;
diff --git a/test-framework/remote-providers/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory b/test-framework/remote-providers/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory
index 3c3a1a132f8..3cf85adb961 100644
--- a/test-framework/remote-providers/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory
+++ b/test-framework/remote-providers/src/main/resources/META-INF/services/org.keycloak.services.resource.RealmResourceProviderFactory
@@ -1,2 +1,2 @@
-org.keycloak.testframework.remote.providers.TimeOffSetRealmResourceProviderFactory
+org.keycloak.testframework.remote.providers.timeoffset.TimeOffSetRealmResourceProviderFactory
 org.keycloak.testframework.remote.providers.runonserver.RunOnServerRealmResourceProviderFactory
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java
index 741c519e72e..ab9ecdbbb6a 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/RemoteTestFrameworkExtension.java
@@ -3,8 +3,8 @@ package org.keycloak.testframework.remote;
 import org.keycloak.testframework.TestFrameworkExtension;
 import org.keycloak.testframework.injection.Supplier;
 import org.keycloak.testframework.remote.timeoffset.TimeOffsetSupplier;
-import org.keycloak.testframework.runonserver.RunOnServerSupplier;
-import org.keycloak.testframework.runonserver.TestClassServerSupplier;
+import org.keycloak.testframework.remote.runonserver.RunOnServerSupplier;
+import org.keycloak.testframework.remote.runonserver.TestClassServerSupplier;
 
 import java.util.List;
 
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectRunOnServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java
similarity index 89%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectRunOnServer.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java
index f770ed81172..0cecc1605f3 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectRunOnServer.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectRunOnServer.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import org.keycloak.testframework.injection.LifeCycle;
 
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectTestClassServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java
similarity index 87%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectTestClassServer.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java
index 71e163aafbd..2f496f8a84d 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/InjectTestClassServer.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/InjectTestClassServer.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import org.keycloak.testframework.injection.LifeCycle;
 
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerClient.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java
similarity index 98%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerClient.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java
index 8a008006a4c..931c44898ad 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerClient.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerClient.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import jakarta.ws.rs.WebApplicationException;
 import jakarta.ws.rs.core.Response;
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerSupplier.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java
similarity index 97%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerSupplier.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java
index 9ea23f5f4f2..e927a6cff1f 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/RunOnServerSupplier.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/RunOnServerSupplier.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import org.apache.http.client.HttpClient;
 import org.keycloak.testframework.injection.InstanceContext;
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServer.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java
similarity index 98%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServer.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java
index 752eaaa4210..c95bf6fa0df 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServer.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServer.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
diff --git a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServerSupplier.java b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java
similarity index 93%
rename from test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServerSupplier.java
rename to test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java
index 4804cfa5bdb..1abb99bbc18 100644
--- a/test-framework/remote/src/main/java/org/keycloak/testframework/runonserver/TestClassServerSupplier.java
+++ b/test-framework/remote/src/main/java/org/keycloak/testframework/remote/runonserver/TestClassServerSupplier.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import org.keycloak.testframework.injection.InstanceContext;
 import org.keycloak.testframework.injection.RequestedInstance;
diff --git a/test-framework/remote/src/test/java/org/keycloak/testframework/runonserver/TestClassServerTest.java b/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java
similarity index 95%
rename from test-framework/remote/src/test/java/org/keycloak/testframework/runonserver/TestClassServerTest.java
rename to test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java
index 08baed9c56a..68c76f35671 100644
--- a/test-framework/remote/src/test/java/org/keycloak/testframework/runonserver/TestClassServerTest.java
+++ b/test-framework/remote/src/test/java/org/keycloak/testframework/remote/runonserver/TestClassServerTest.java
@@ -1,4 +1,4 @@
-package org.keycloak.testframework.runonserver;
+package org.keycloak.testframework.remote.runonserver;
 
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
diff --git a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java
index 48adff5fd54..26b9c059043 100644
--- a/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java
+++ b/tests/base/src/test/java/org/keycloak/tests/admin/authentication/AuthenticatorConfigTest.java
@@ -37,8 +37,8 @@ import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
 import org.keycloak.testframework.events.AdminEventAssertion;
 import org.keycloak.testframework.events.AdminEvents;
 import org.keycloak.testframework.realm.ManagedRealm;
-import org.keycloak.testframework.runonserver.InjectRunOnServer;
-import org.keycloak.testframework.runonserver.RunOnServerClient;
+import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
+import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
 import org.keycloak.testframework.util.ApiUtil;
 import org.keycloak.tests.utils.Assert;
 import org.keycloak.tests.utils.admin.AdminEventPaths;