diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/appclient/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/appclient/Client.java
index 3b2def8582..5293bfee72 100644
--- a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/appclient/Client.java
+++ b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/appclient/Client.java
@@ -89,7 +89,6 @@ public void setup(String[] args, Properties p) throws Fault {
     }
   }
 
-
   static final String VEHICLE_ARCHIVE = "assembly_classpath_appclient";
 
   @TargetsContainer("tck-appclient")
@@ -98,25 +97,25 @@ public void setup(String[] args, Properties p) throws Fault {
   public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
 
     JavaArchive direct_classpath_util = ShrinkWrap.create(JavaArchive.class, "direct_classpath_util.jar");
-    direct_classpath_util.addClass(com.sun.ts.tests.assembly.classpath.util.ClassPathUtil.class);
+    direct_classpath_util.addClasses(com.sun.ts.tests.assembly.classpath.util.ClassPathUtil.class,
+    Client.class);
     URL resURL = Client.class.getResource("/util/META-INF/ejb-jar.xml");
     if (resURL != null) {
       direct_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml");
     }
+    direct_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    // archiveProcessor.processEjbArchive(direct_classpath_util, Client.class, resURL);
 
-    // direct_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
-    //     "MANIFEST.MF");
-    archiveProcessor.processEjbArchive(direct_classpath_util, Client.class, resURL);
 
     JavaArchive indirect_classpath_util = ShrinkWrap.create(JavaArchive.class, "indirect_classpath_util.jar");
-    indirect_classpath_util.addClass(com.sun.ts.tests.assembly.classpath.util.IndirectClassPathUtil.class);
+    indirect_classpath_util.addClasses(com.sun.ts.tests.assembly.classpath.util.IndirectClassPathUtil.class,
+    Client.class);
     resURL = Client.class.getResource("/util/META-INF/ejb-jar.xml");
     if (resURL != null) {
       indirect_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml");
     }
-    // indirect_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
-    //     "MANIFEST.MF");
-    archiveProcessor.processEjbArchive(indirect_classpath_util, Client.class, resURL);
+    indirect_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    // archiveProcessor.processEjbArchive(indirect_classpath_util, Client.class, resURL);
 
     JavaArchive assembly_classpath_appclient_client = ShrinkWrap.create(JavaArchive.class,
         "assembly_classpath_appclient_client.jar");
@@ -140,13 +139,13 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
     assembly_classpath_appclient_ear.addAsLibrary(direct_classpath_util);
     assembly_classpath_appclient_ear.addAsLibrary(indirect_classpath_util);
     assembly_classpath_appclient_ear.addAsModule(assembly_classpath_appclient_client);
+    assembly_classpath_appclient_ear.addAsModule(indirect_classpath_util);
+    assembly_classpath_appclient_ear.addAsModule(direct_classpath_util);
 
     URL earResURL = Client.class.getResource("application.xml");
     if (earResURL != null) {
       assembly_classpath_appclient_ear.addAsManifestResource(earResURL, "application.xml");
     }
-    // assembly_classpath_appclient_ear
-    //     .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
     archiveProcessor.processEarArchive(assembly_classpath_appclient_ear, Client.class, earResURL);
 
     return assembly_classpath_appclient_ear;
diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java
index 358bb220cc..0ce3228908 100644
--- a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java
+++ b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java
@@ -97,24 +97,24 @@ public void setup(String[] args, Properties p) throws Fault {
   public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource TestArchiveProcessor archiveProcessor) {
 
     JavaArchive direct_classpath_util = ShrinkWrap.create(JavaArchive.class, "direct_classpath_util.jar");
-    direct_classpath_util.addClass(com.sun.ts.tests.assembly.classpath.util.ClassPathUtil.class);
+    direct_classpath_util.addClasses(com.sun.ts.tests.assembly.classpath.util.ClassPathUtil.class,
+    Client.class);
     URL resURL = Client.class.getResource("/util/META-INF/ejb-jar.xml");
     if (resURL != null) {
       direct_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml");
     }
-    // direct_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
-    //     "MANIFEST.MF");
-    archiveProcessor.processEjbArchive(direct_classpath_util, Client.class, resURL);
+    direct_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    // archiveProcessor.processEjbArchive(direct_classpath_util, Client.class, resURL);
 
     JavaArchive indirect_classpath_util = ShrinkWrap.create(JavaArchive.class, "indirect_classpath_util.jar");
-    indirect_classpath_util.addClass(com.sun.ts.tests.assembly.classpath.util.IndirectClassPathUtil.class);
+    indirect_classpath_util.addClasses(com.sun.ts.tests.assembly.classpath.util.IndirectClassPathUtil.class,
+    Client.class);
     resURL = Client.class.getResource("/util/META-INF/ejb-jar.xml");
     if (resURL != null) {
       indirect_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml");
     }
-    // indirect_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"),
-    //     "MANIFEST.MF");
-    archiveProcessor.processEjbArchive(indirect_classpath_util, Client.class, resURL);
+    indirect_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    // archiveProcessor.processEjbArchive(indirect_classpath_util, Client.class, resURL);
 
 
     JavaArchive assembly_classpath_ejb_client = ShrinkWrap.create(JavaArchive.class,
@@ -155,8 +155,8 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
     if(ejbResURL != null) {
       assembly_classpath_ejb_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml");
     }
-    // assembly_classpath_ejb_ejb
-    //     .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    assembly_classpath_ejb_ejb
+        .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
     archiveProcessor.processEjbArchive(assembly_classpath_ejb_ejb, Client.class, ejbResURL);
 
     EnterpriseArchive assembly_classpath_ejb_ear = ShrinkWrap.create(EnterpriseArchive.class,
@@ -165,13 +165,16 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test
         assembly_classpath_ejb_ear.addAsLibrary(indirect_classpath_util);
         assembly_classpath_ejb_ear.addAsModule(assembly_classpath_ejb_client);
         assembly_classpath_ejb_ear.addAsModule(assembly_classpath_ejb_ejb);
+        assembly_classpath_ejb_ear.addAsModule(indirect_classpath_util);
+        assembly_classpath_ejb_ear.addAsModule(direct_classpath_util);
+    
 
     URL earResURL = Client.class.getResource("application.xml");
     if (earResURL != null) {
       assembly_classpath_ejb_ear.addAsManifestResource(earResURL, "application.xml");
     }
-    // assembly_classpath_ejb_ear
-    //     .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
+    assembly_classpath_ejb_ear
+        .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF");
     archiveProcessor.processEarArchive(assembly_classpath_ejb_ear, Client.class, earResURL);
 
     return assembly_classpath_ejb_ear;
diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java
index 4f517f2f77..5780ce8620 100644
--- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java
+++ b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java
@@ -145,8 +145,6 @@ public static JavaArchive createEjbDeploymentVehicle(@ArquillianResource TestArc
         com.sun.ts.tests.assembly.standalone.jar.TestBeanEJB.class,
         com.sun.ts.tests.common.ejb.wrappers.Stateless3xWrapper.class,
         com.sun.ts.lib.util.RemoteLoggingInitException.class,
-        com.sun.ts.lib.util.TestReportInfo.class,
-        com.sun.ts.lib.util.TestUtil.class,
         com.sun.ts.tests.assembly.standalone.jar.Client.class);
     // The application-client.xml descriptor
     URL resURL = Client.class.getResource("assembly_standalone_jar_component_ejb.xml");
diff --git a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml
index 4154e47d6e..80a5f5f28f 100644
--- a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml
+++ b/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml
@@ -55,7 +55,7 @@
             <!-- <property name="clientEnvString">PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true;
                 APPCPATH=${glassfish.home}/glassfish/lib/arquillian-protocol-lib.jar:${glassfish.home}/glassfish/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar</property> -->
             <property name="clientEnvString">AS_JAVA=${env.JAVA_HOME};PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true;
-                 APPCPATH=target/lib/arquillian-protocol-lib.jar:target/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar:${glassfish.home}/glassfish/lib/gf-client.jar</property>
+                 APPCPATH=target/lib/libutil.jar:target/lib/arquillian-protocol-lib.jar:target/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar:${glassfish.home}/glassfish/lib/gf-client.jar</property>
             <property name="clientDir">${project.basedir}</property>
             <property name="workDir">/tmp</property>
             <property name="tsJteFile">jakartaeetck/bin/ts.jte</property>