diff --git a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts
index 607effb0c6c1..161408814315 100644
--- a/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-2.0-common-testing/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("org.unbroken-dome.xjc")
+  id("com.github.bjornvester.xjc")
   id("otel.java-conventions")
 }
 
@@ -10,6 +10,11 @@ tasks {
   }
 }
 
+xjc {
+  xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
+  useJakarta.set(false)
+}
+
 dependencies {
   api("javax.xml.ws:jaxws-api:2.0")
   api("javax.jws:javax.jws-api:1.1")
diff --git a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts
index 0827852d5c94..4ec0ee7c4675 100644
--- a/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts
+++ b/instrumentation/jaxws/jaxws-3.0-common-testing/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-  id("org.unbroken-dome.xjc")
+  id("com.github.bjornvester.xjc")
   id("otel.java-conventions")
 }
 
@@ -10,6 +10,11 @@ tasks {
   }
 }
 
+xjc {
+  xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
+  useJakarta.set(true)
+}
+
 dependencies {
   api("jakarta.xml.ws:jakarta.xml.ws-api:3.0.0")
   api("jakarta.jws:jakarta.jws-api:3.0.0")
@@ -18,7 +23,4 @@ dependencies {
   api("org.springframework.ws:spring-ws-core:4.0.0")
 
   implementation(project(":testing-common"))
-
-  xjcTool("com.sun.xml.bind:jaxb-xjc:3.0.2")
-  xjcTool("com.sun.xml.bind:jaxb-impl:3.0.2")
 }
diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
index 47cdcc7e70c4..f1a063be7190 100644
--- a/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/spring/spring-ws-2.0/javaagent/build.gradle.kts
@@ -1,5 +1,4 @@
 plugins {
-  id("org.unbroken-dome.xjc")
   id("otel.javaagent-instrumentation")
 }
 
@@ -14,21 +13,6 @@ muzzle {
   }
 }
 
-sourceSets {
-  test {
-    resources {
-      srcDirs("src/test/schema")
-    }
-  }
-}
-
-tasks {
-  named<Checkstyle>("checkstyleTest") {
-    // exclude generated web service classes
-    exclude("**/hello_web_service/**")
-  }
-}
-
 dependencies {
   compileOnly("org.springframework.ws:spring-ws-core:2.0.0.RELEASE")
 
@@ -46,7 +30,9 @@ dependencies {
   testImplementation("javax.xml.bind:jaxb-api:2.2.11")
   testImplementation("com.sun.xml.bind:jaxb-core:2.2.11")
   testImplementation("com.sun.xml.bind:jaxb-impl:2.2.11")
+  testImplementation("javax.activation:activation:1.1.1")
   testImplementation("com.google.guava:guava")
+  testImplementation(project(":instrumentation:spring:spring-ws-2.0:testing"))
 
   testInstrumentation(project(":instrumentation:servlet:servlet-3.0:javaagent"))
 }
diff --git a/instrumentation/spring/spring-ws-2.0/testing/build.gradle.kts b/instrumentation/spring/spring-ws-2.0/testing/build.gradle.kts
new file mode 100644
index 000000000000..9cdbed4dc9bf
--- /dev/null
+++ b/instrumentation/spring/spring-ws-2.0/testing/build.gradle.kts
@@ -0,0 +1,27 @@
+plugins {
+  id("com.github.bjornvester.xjc")
+  id("otel.java-conventions")
+}
+
+sourceSets {
+  main {
+    resources {
+      srcDirs("src/main/schema")
+    }
+  }
+}
+
+tasks {
+  named<Checkstyle>("checkstyleMain") {
+    // exclude generated web service classes
+    exclude("**/hello_web_service/**")
+  }
+}
+
+xjc {
+  xsdDir.set(layout.projectDirectory.dir("src/main/schema"))
+  useJakarta.set(false)
+}
+
+dependencies {
+}
diff --git a/instrumentation/spring/spring-ws-2.0/javaagent/src/test/schema/hello.xsd b/instrumentation/spring/spring-ws-2.0/testing/src/main/schema/hello.xsd
similarity index 100%
rename from instrumentation/spring/spring-ws-2.0/javaagent/src/test/schema/hello.xsd
rename to instrumentation/spring/spring-ws-2.0/testing/src/main/schema/hello.xsd
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 163720f93e50..3e5f99f16b8f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
     id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
     id("org.jetbrains.kotlin.jvm") version "2.2.10"
     id("org.xbib.gradle.plugin.jflex") version "3.0.2"
-    id("org.unbroken-dome.xjc") version "2.0.0"
+    id("com.github.bjornvester.xjc") version "1.8.2"
     id("org.graalvm.buildtools.native") version "0.11.0"
   }
 }
@@ -590,6 +590,7 @@ include(":instrumentation:spring:spring-webmvc:spring-webmvc-6.0:library")
 include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:javaagent")
 include(":instrumentation:spring:spring-webmvc:spring-webmvc-common:testing")
 include(":instrumentation:spring:spring-ws-2.0:javaagent")
+include(":instrumentation:spring:spring-ws-2.0:testing")
 include(":instrumentation:spring:starters:spring-boot-starter")
 include(":instrumentation:spring:starters:zipkin-spring-boot-starter")
 include(":instrumentation:spymemcached-2.12:javaagent")