diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java
index e9befcfeda1..ec866fbccc0 100644
--- a/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/Base2TestSuite.java
@@ -14,6 +14,7 @@ import org.junit.platform.suite.api.Suite;
         "org.keycloak.tests.keys",
         "org.keycloak.tests.oauth",
         "org.keycloak.tests.tracing",
+        "org.keycloak.tests.transactions",
         "org.keycloak.tests.welcomepage"
 })
 public class Base2TestSuite {
diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java
index 2295076013a..eb4165713f6 100644
--- a/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/DatabaseTestSuite.java
@@ -1,6 +1,7 @@
 package org.keycloak.tests.suites;
 
 import org.keycloak.tests.keys.GeneratedRsaKeyProviderTest;
+import org.keycloak.tests.transactions.TransactionsTest;
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.SelectPackages;
@@ -12,7 +13,8 @@ import org.junit.platform.suite.api.Suite;
         "org.keycloak.tests.db"
 })
 @SelectClasses({
-        GeneratedRsaKeyProviderTest.class
+        GeneratedRsaKeyProviderTest.class,
+        TransactionsTest.class
 })
 public class DatabaseTestSuite {
 }
diff --git a/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java
index 6f2463c892b..b55e0d69293 100644
--- a/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java
+++ b/tests/base/src/test/java/org/keycloak/tests/suites/JDKTestSuite.java
@@ -3,6 +3,7 @@ package org.keycloak.tests.suites;
 import org.keycloak.tests.admin.client.CredentialsTest;
 import org.keycloak.tests.keys.GeneratedRsaKeyProviderTest;
 import org.keycloak.tests.keys.JavaKeystoreKeyProviderTest;
+import org.keycloak.tests.transactions.TransactionsTest;
 
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
@@ -11,7 +12,8 @@ import org.junit.platform.suite.api.Suite;
 @SelectClasses({
         CredentialsTest.class,
         GeneratedRsaKeyProviderTest.class,
-        JavaKeystoreKeyProviderTest.class
+        JavaKeystoreKeyProviderTest.class,
+        TransactionsTest.class
 })
 public class JDKTestSuite {
 }
diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java b/tests/base/src/test/java/org/keycloak/tests/transactions/TransactionsTest.java
similarity index 56%
rename from testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java
rename to tests/base/src/test/java/org/keycloak/tests/transactions/TransactionsTest.java
index fc6f9b9884e..0c0595ddfc7 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/transactions/TransactionsTest.java
+++ b/tests/base/src/test/java/org/keycloak/tests/transactions/TransactionsTest.java
@@ -15,39 +15,38 @@
  * limitations under the License.
  */
 
-package org.keycloak.testsuite.transactions;
+package org.keycloak.tests.transactions;
 
-import java.util.List;
+import org.keycloak.testframework.annotations.KeycloakIntegrationTest;
+import org.keycloak.testframework.remote.runonserver.InjectRunOnServer;
+import org.keycloak.testframework.remote.runonserver.RunOnServerClient;
 
-import org.keycloak.representations.idm.RealmRepresentation;
-import org.keycloak.testsuite.AbstractKeycloakTest;
-
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
  */
-public class TransactionsTest extends AbstractKeycloakTest {
+@KeycloakIntegrationTest
+public class TransactionsTest {
+
+    @InjectRunOnServer
+    RunOnServerClient runOnServer;
 
     @Test
     public void testTransactionActive() {
-        testingClient.server().run(
+        runOnServer.run(
                 session -> {
-                    Assert.assertTrue(session.getTransactionManager().isActive());
+                    Assertions.assertTrue(session.getTransactionManager().isActive());
                     session.getTransactionManager().commit();
-                    Assert.assertFalse(session.getTransactionManager().isActive());
+                    Assertions.assertFalse(session.getTransactionManager().isActive());
 
                     session.getTransactionManager().begin();
-                    Assert.assertTrue(session.getTransactionManager().isActive());
+                    Assertions.assertTrue(session.getTransactionManager().isActive());
                     session.getTransactionManager().rollback();
-                    Assert.assertFalse(session.getTransactionManager().isActive());
+                    Assertions.assertFalse(session.getTransactionManager().isActive());
                 }
         );
     }
 
-    @Override
-    public void addTestRealms(List<RealmRepresentation> testRealms) {
-    }
-
 }
diff --git a/testsuite/integration-arquillian/tests/base/testsuites/base-suite b/testsuite/integration-arquillian/tests/base/testsuites/base-suite
index 0b847581f7c..78eb086edda 100644
--- a/testsuite/integration-arquillian/tests/base/testsuites/base-suite
+++ b/testsuite/integration-arquillian/tests/base/testsuites/base-suite
@@ -35,7 +35,6 @@ session,6
 sessionlimits,6
 ssl,6
 theme,6
-transactions,6
 url,6
 user,4
 util,4
diff --git a/testsuite/integration-arquillian/tests/base/testsuites/database-suite b/testsuite/integration-arquillian/tests/base/testsuites/database-suite
index 1775773b0f1..49e68df40a3 100644
--- a/testsuite/integration-arquillian/tests/base/testsuites/database-suite
+++ b/testsuite/integration-arquillian/tests/base/testsuites/database-suite
@@ -12,7 +12,6 @@ RefreshTokenTest
 RequiredActionUpdateProfileTest
 SSOTest
 SamlClientTest
-TransactionsTest
 UserProfileTest
 OidcAdvancedClaimToGroupMapperTest
 OidcAdvancedClaimToRoleMapperTest
diff --git a/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite b/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite
index 2c69b1b6db1..b4775ce263a 100644
--- a/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite
+++ b/testsuite/integration-arquillian/tests/base/testsuites/jdk-suite
@@ -10,6 +10,5 @@ MutualTLSClientTest
 PasswordPolicyTest
 SSOTest
 SamlClientTest
-TransactionsTest
 X509BrowserLoginTest
 ThemeResourceProviderTest