diff --git a/jetty-embedded-12-ee10/src/test/resources/jetty-env.xml b/jetty-embedded-12-ee10/src/test/resources/jetty-env.xml
index 553a0cd..c364402 100644
--- a/jetty-embedded-12-ee10/src/test/resources/jetty-env.xml
+++ b/jetty-embedded-12-ee10/src/test/resources/jetty-env.xml
@@ -3,7 +3,7 @@
 
 <Configure id="webAppCtx" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
 
-  <New class="org.eclipse.jetty.ee10.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>
       <Ref refid="webAppCtx"/>
     </Arg>
@@ -11,12 +11,12 @@
     <Arg type="java.lang.String">Embedded</Arg>
     <Arg type="boolean">true</Arg>
   </New>
-  <New class="org.eclipse.jetty.ee10.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>version</Arg>
     <Arg type="java.lang.Integer">6</Arg>
     <Arg type="boolean">true</Arg>
   </New>
-  <New class="org.eclipse.jetty.ee10.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>
       <Ref refid="webAppCtx"/>
     </Arg>
diff --git a/jetty-embedded-12-ee9/src/test/resources/jetty-env.xml b/jetty-embedded-12-ee9/src/test/resources/jetty-env.xml
index 376348a..5e762a7 100644
--- a/jetty-embedded-12-ee9/src/test/resources/jetty-env.xml
+++ b/jetty-embedded-12-ee9/src/test/resources/jetty-env.xml
@@ -3,7 +3,7 @@
 
 <Configure id="webAppCtx" class="org.eclipse.jetty.ee9.webapp.WebAppContext">
 
-  <New class="org.eclipse.jetty.ee9.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>
       <Ref refid="webAppCtx"/>
     </Arg>
@@ -11,12 +11,12 @@
     <Arg type="java.lang.String">Embedded</Arg>
     <Arg type="boolean">true</Arg>
   </New>
-  <New class="org.eclipse.jetty.ee9.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>version</Arg>
     <Arg type="java.lang.Integer">6</Arg>
     <Arg type="boolean">true</Arg>
   </New>
-  <New class="org.eclipse.jetty.ee9.plus.jndi.EnvEntry">
+  <New class="org.eclipse.jetty.plus.jndi.EnvEntry">
     <Arg>
       <Ref refid="webAppCtx"/>
     </Arg>