diff --git a/javax/src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java b/src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java
similarity index 93%
rename from javax/src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java
rename to src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java
index 4110f6ef3..4cae14fc1 100644
--- a/javax/src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java
+++ b/src/test/java/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.java
@@ -24,6 +24,9 @@
 import com.arjuna.ats.jta.common.JTAEnvironmentBean;
 import com.arjuna.ats.jta.common.jtaPropertyManager;
 import com.arjuna.common.internal.util.propertyservice.BeanPopulator;
+import jakarta.transaction.TransactionManager;
+import jakarta.transaction.TransactionSynchronizationRegistry;
+import jakarta.transaction.UserTransaction;
 import org.jboss.byteman.contrib.bmunit.BMScript;
 import org.jboss.byteman.contrib.bmunit.BMUnitRunner;
 import org.jboss.ejb.client.test.AbstractEJBClientTestCase;
@@ -40,9 +43,6 @@
 import org.wildfly.transaction.client.*;
 import org.wildfly.transaction.client.provider.jboss.JBossLocalTransactionProvider;
 
-import javax.transaction.TransactionManager;
-import javax.transaction.TransactionSynchronizationRegistry;
-import javax.transaction.UserTransaction;
 import java.io.File;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -72,12 +72,10 @@ public static void beforeClass() throws Exception {
         jtaEnvironmentBean.setTransactionManagerClassName(TransactionManagerImple.class.getName());
         jtaEnvironmentBean.setTransactionSynchronizationRegistryClassName(TransactionSynchronizationRegistryImple.class.getName());
         final TransactionManager narayanaTm = jtaEnvironmentBean.getTransactionManager();
-        final TransactionSynchronizationRegistry narayanaTsr = jtaEnvironmentBean.getTransactionSynchronizationRegistry();
         final XATerminator xat = new XATerminator();
         final JBossLocalTransactionProvider.Builder builder = JBossLocalTransactionProvider.builder();
-        builder.setXATerminator(xat).setExtendedJBossXATerminator(xat);
+        builder.setExtendedJBossXATerminator(xat);
         builder.setTransactionManager(narayanaTm);
-        builder.setTransactionSynchronizationRegistry(narayanaTsr);
         builder.setXAResourceRecoveryRegistry(new XAResourceRecoveryRegistry() {
             @Override
             public void addXAResourceRecovery(XAResourceRecovery xaResourceRecovery) {
diff --git a/javax/src/test/resources/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.btm b/src/test/resources/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.btm
similarity index 100%
rename from javax/src/test/resources/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.btm
rename to src/test/resources/org/jboss/ejb/client/test/byteman/BytemanTransactionTestCase.btm