diff --git a/appserver/tests/appserv-tests/config/common.xml b/appserver/tests/appserv-tests/config/common.xml
index ca3f63d7724..0c181cab901 100644
--- a/appserver/tests/appserv-tests/config/common.xml
+++ b/appserver/tests/appserv-tests/config/common.xml
@@ -1424,11 +1424,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <os name="AIX" />
 </condition>
 
-<target name="execute-sleep" if="aix">
-    <sleep seconds="15" />
-</target>
-
-
 <!-- start Derby Database -->
 <target name="startDerby">
     <condition property="darwin">
@@ -1575,8 +1570,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
     </exec>
-    <sleep seconds="30"/>
-        <exec executable="${ASADMIN}" failonerror="false">
+    <exec executable="${ASADMIN}" failonerror="false">
         <arg line="start-instance"/>
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
@@ -1744,7 +1738,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
 
 <target name="restart-server">
     <antcall target="stop-server" />
-    <sleep seconds="5" />
     <antcall target="start-server" />
 
 </target>
@@ -1759,7 +1752,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <exec executable="${env.S1AS_HOME}/bin/asadmin">
         <arg value="stop-domain" />
     </exec>
-    <sleep seconds="10" />
 </target>
 
 <target name="stop-server-windows" if="isWindows">
@@ -1769,7 +1761,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg value="${env.S1AS_HOME}\bin\asadmin.bat" />
         <arg value="stop-domain" />
     </exec>
-    <sleep seconds="5" />
 </target>
 
 <target name="start-server" depends="setOSConditions">
@@ -1790,7 +1781,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <env key="GlassFish_Platform" value="Felix" />
         <arg value="start-domain" />
     </exec>
-    <sleep seconds="10" />
 </target>
 
 <target name="start-server-windows" if="isWindows">
@@ -1800,7 +1790,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg value="${env.S1AS_HOME}\bin\asadmin.bat" />
         <arg value="start-domain" />
     </exec>
-    <sleep seconds="5" />
 </target>
 
 <target name="create-jvm-options" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
index bad7f13fb79..b8e198e1bd5 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/osgi-cdi/common.xml
@@ -1662,8 +1662,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
     </exec>
-    <sleep seconds="30"/>
-        <exec executable="${ASADMIN}" failonerror="false">
+    <exec executable="${ASADMIN}" failonerror="false">
         <arg line="start-instance"/>
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
@@ -1831,7 +1830,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
 
     <target name="restart-server">
         <antcall target="stop-server"/>
-        <sleep seconds="5"/>
         <antcall target="start-server"/>
 
     </target>
@@ -1846,7 +1844,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <exec executable="${env.S1AS_HOME}/bin/asadmin">
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="stop-server-windows" if="isWindows">
@@ -1856,7 +1853,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="start-server" depends="setOSConditions">
@@ -1877,7 +1873,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <env key="GlassFish_Platform" value="Felix"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="start-server-windows" if="isWindows">
@@ -1887,7 +1882,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="create-jvm-options" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
index bad7f13fb79..1a6189d183d 100644
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
+++ b/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/common.xml
@@ -1662,7 +1662,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
     </exec>
-    <sleep seconds="30"/>
         <exec executable="${ASADMIN}" failonerror="false">
         <arg line="start-instance"/>
         <arg line="${as.props}"/>
@@ -1831,9 +1830,7 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
 
     <target name="restart-server">
         <antcall target="stop-server"/>
-        <sleep seconds="5"/>
         <antcall target="start-server"/>
-
     </target>
 
     <target name="stop-server" depends="setOSConditions">
@@ -1846,7 +1843,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <exec executable="${env.S1AS_HOME}/bin/asadmin">
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="stop-server-windows" if="isWindows">
@@ -1856,7 +1852,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="start-server" depends="setOSConditions">
@@ -1877,7 +1872,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <env key="GlassFish_Platform" value="Felix"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="start-server-windows" if="isWindows">
@@ -1887,7 +1881,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="create-jvm-options" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml b/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
index 664be842076..7da0808866f 100644
--- a/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
+++ b/appserver/tests/appserv-tests/devtests/jdbc/JdbcCommon.xml
@@ -373,7 +373,6 @@
               <jvmarg value="-Dderby.system.home=${env.S1AS_HOME}/databases"/>
           </java>
       </parallel>
-      <antcall target="execute-sleep"/>
    </target>
 
    <target name="start-derby-nonaix" unless="aix">
diff --git a/appserver/tests/quicklook/gfproject/v3-targets.xml b/appserver/tests/quicklook/gfproject/v3-targets.xml
index 26b1fd6f4cd..ce7428589d8 100644
--- a/appserver/tests/quicklook/gfproject/v3-targets.xml
+++ b/appserver/tests/quicklook/gfproject/v3-targets.xml
@@ -126,9 +126,6 @@
         <arg value="${glassfish.home}\bin\asadmin.bat"/>
         <arg value="start-domain"/>
     </exec>
-    <!-- JRuby deplyment needs GF start server to be fully done.
-         Introduce a delay for now and will investigate futher.  -->
-    <sleep seconds="10"/>
 </target>
 
 <target name="stop-server" depends="setOSConditions">
diff --git a/appserver/tests/v2-tests/appserv-tests/config/common.xml b/appserver/tests/v2-tests/appserv-tests/config/common.xml
index 462e0b31997..820d939eab7 100644
--- a/appserver/tests/v2-tests/appserv-tests/config/common.xml
+++ b/appserver/tests/v2-tests/appserv-tests/config/common.xml
@@ -1475,10 +1475,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
     <os name="AIX"/>
 </condition>
 
-<target name="execute-sleep" if="aix">
-    <sleep seconds="15"/>
-</target>
-
 
 <!--  start Derby Database -->
 <target name="startDerby">
@@ -1642,7 +1638,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <arg line="${as.props}"/>
         <arg line="${appserver.instance.name}"/>
     </exec>
-    <sleep seconds="30"/>
     <exec executable="${ASADMIN}" failonerror="false">
         <arg line="start-instance"/>
         <arg line="${as.props}"/>
@@ -1811,7 +1806,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
 
     <target name="restart-server">
         <antcall target="stop-server"/>
-        <sleep seconds="5"/>
         <antcall target="start-server"/>
 
     </target>
@@ -1826,7 +1820,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
         <exec executable="${env.S1AS_HOME}/bin/asadmin">
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="stop-server-windows" if="isWindows">
@@ -1836,7 +1829,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="stop-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="start-server" depends="setOSConditions">
@@ -1857,7 +1849,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <env key="GlassFish_Platform" value="Felix"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="10"/>
     </target>
 
     <target name="start-server-windows" if="isWindows">
@@ -1867,7 +1858,6 @@ AS_ADMIN_MASTERPASSWORD=${master.password}
             <arg value="${env.S1AS_HOME}\bin\asadmin.bat"/>
             <arg value="start-domain"/>
         </exec>
-        <sleep seconds="5"/>
     </target>
 
     <target name="create-jvm-options" depends="init-common">