diff --git a/nucleus/tests/admin-adon/osgi.bundle b/appserver/tests/admin/admin-extension/osgi.bundle
similarity index 100%
rename from nucleus/tests/admin-adon/osgi.bundle
rename to appserver/tests/admin/admin-extension/osgi.bundle
diff --git a/nucleus/tests/admin-adon/pom.xml b/appserver/tests/admin/admin-extension/pom.xml
similarity index 72%
rename from nucleus/tests/admin-adon/pom.xml
rename to appserver/tests/admin/admin-extension/pom.xml
index 9dcd67e83ce..071b62225cd 100644
--- a/nucleus/tests/admin-adon/pom.xml
+++ b/appserver/tests/admin/admin-extension/pom.xml
@@ -21,36 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.glassfish.main.tests</groupId>
-        <artifactId>nucleus-tests</artifactId>
+        <artifactId>admin-tests-parent</artifactId>
         <version>6.2.6-SNAPSHOT</version>
     </parent>
-    <artifactId>test-progress-status-commands</artifactId>
-    <name>Progress status - Test Commands</name>
+    <artifactId>test-progress-admin-extension</artifactId>
+    <name>GlassFish Admin Tests - Progress Admin Extension</name>
     <packaging>glassfish-jar</packaging>
-
-    <properties>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.1</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressComplexCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressCustomCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressDoubleTotalsCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressExecOtherCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFailInHalfCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressFullAnnotCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressPayloadCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressSimpleCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressStepBackCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/ProgressWithSupplementCommand.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementAfter.java
diff --git a/nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java b/appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java
similarity index 100%
rename from nucleus/tests/admin-adon/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java
rename to appserver/tests/admin/admin-extension/src/main/java/com/sun/enterprise/tests/progress/SupplementBefore.java
diff --git a/appserver/tests/admin/pom.xml b/appserver/tests/admin/pom.xml
new file mode 100755
index 00000000000..153f9790246
--- /dev/null
+++ b/appserver/tests/admin/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.glassfish.main.tests</groupId>
+        <artifactId>tests</artifactId>
+        <version>6.2.6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>admin-tests-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <name>GlassFish Admin Tests - Parent</name>
+
+    <modules>
+        <module>admin-extension</module>
+        <module>tests</module>
+    </modules>
+</project>
diff --git a/nucleus/tests/admin/pom.xml b/appserver/tests/admin/tests/pom.xml
similarity index 91%
rename from nucleus/tests/admin/pom.xml
rename to appserver/tests/admin/tests/pom.xml
index fec6bc358a8..488be10476d 100644
--- a/nucleus/tests/admin/pom.xml
+++ b/appserver/tests/admin/tests/pom.xml
@@ -22,15 +22,13 @@
 
     <parent>
         <groupId>org.glassfish.main.tests</groupId>
-        <artifactId>nucleus-tests</artifactId>
+        <artifactId>admin-tests-parent</artifactId>
         <version>6.2.6-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.glassfish.tests</groupId>
-    <artifactId>nucleus-admin</artifactId>
+    <artifactId>admin-tests</artifactId>
 
-    <name>Nucleus Tests - Admin</name>
-    <description>This pom describes how to run admin developer tests on the Nucleus Bundle</description>
+    <name>GlassFish Admin Tests</name>
 
     <dependencies>
         <dependency>
@@ -77,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.tests</groupId>
-            <artifactId>test-progress-status-commands</artifactId>
+            <artifactId>test-progress-admin-extension</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -122,7 +120,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>test-progress-status-commands</includeArtifactIds>
+                            <includeArtifactIds>test-progress-admin-extension</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>${project.build.directory}/glassfish6/glassfish/modules</outputDirectory>
                         </configuration>
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/RestTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/RestTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigTest.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainLifecycleExtension.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/NucleusTestUtils.java
diff --git a/nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java
similarity index 100%
rename from nucleus/tests/admin/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/StopDomainExtension.java
diff --git a/nucleus/tests/admin/src/test/resources/password.txt b/appserver/tests/admin/tests/src/test/resources/password.txt
similarity index 100%
rename from nucleus/tests/admin/src/test/resources/password.txt
rename to appserver/tests/admin/tests/src/test/resources/password.txt
diff --git a/nucleus/tests/admin/src/test/resources/password_update.txt b/appserver/tests/admin/tests/src/test/resources/password_update.txt
similarity index 100%
rename from nucleus/tests/admin/src/test/resources/password_update.txt
rename to appserver/tests/admin/tests/src/test/resources/password_update.txt
diff --git a/appserver/tests/pom.xml b/appserver/tests/pom.xml
index 5f723b07087..0798f4026a5 100755
--- a/appserver/tests/pom.xml
+++ b/appserver/tests/pom.xml
@@ -119,6 +119,7 @@
             </activation>
             <modules>
                 <module>tck</module>
+                <module>admin</module>
                 <module>appserv-tests</module>
             </modules>
         </profile>
@@ -129,7 +130,7 @@
         <profile>
             <id>fastest</id>
             <modules>
-                <!-- Compile dependencies -->
+                <!-- Builds compile dependencies for Ant tests executed by runtest.sh/gftest.sh -->
                 <module>appserv-tests</module>
             </modules>
         </profile>
diff --git a/nucleus/pom.xml b/nucleus/pom.xml
index deac9be172d..58f50d79cff 100644
--- a/nucleus/pom.xml
+++ b/nucleus/pom.xml
@@ -74,7 +74,6 @@
         <module>diagnostics</module>
         <module>resources</module>
         <module>featuresets</module>
-        <module>tests</module>
     </modules>
 
     <scm>
diff --git a/nucleus/tests/admin/src/main/java/.gitkeep_empty_dir b/nucleus/tests/admin/src/main/java/.gitkeep_empty_dir
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/nucleus/tests/admin/src/main/resources/.gitkeep_empty_dir b/nucleus/tests/admin/src/main/resources/.gitkeep_empty_dir
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/nucleus/tests/pom.xml b/nucleus/tests/pom.xml
deleted file mode 100755
index e63b81a9a59..00000000000
--- a/nucleus/tests/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
-
-    This program and the accompanying materials are made available under the
-    terms of the Eclipse Public License v. 2.0, which is available at
-    http://www.eclipse.org/legal/epl-2.0.
-
-    This Source Code may also be made available under the following Secondary
-    Licenses when the conditions for such availability set forth in the
-    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-    version 2 with the GNU Classpath Exception, which is available at
-    https://www.gnu.org/software/classpath/license.html.
-
-    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.glassfish.main</groupId>
-        <artifactId>glassfish-nucleus-parent</artifactId>
-        <version>6.2.6-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.glassfish.main.tests</groupId>
-    <artifactId>nucleus-tests</artifactId>
-    <packaging>pom</packaging>
-
-    <name>Nucleus Tests</name>
-
-    <modules>
-        <module>admin</module>
-        <module>admin-adon</module>
-    </modules>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <configuration>
-                        <skip>true</skip>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>