diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf
index 2cfe606d7ce..fbe1efdc1b5 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf
+++ b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf
@@ -60,7 +60,7 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JBOSS_JAVA_SIZING" = "x" ]; then
-   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m -XX:MetaspaceSize=96M"
+   JBOSS_JAVA_SIZING="-Xms64m -Xmx512m"
 fi
 if [ "x$JAVA_OPTS" = "x" ]; then
    JAVA_OPTS="$JBOSS_JAVA_SIZING -Djava.net.preferIPv4Stack=true"
diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat
index 4cb1b159f24..7a95efcb8f6 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat
+++ b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.bat
@@ -47,7 +47,7 @@ rem #
 
 if "x%JBOSS_JAVA_SIZING%" == "x" (
     rem # JVM memory allocation pool parameters - modify as appropriate.
-    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M -XX:MetaspaceSize=96M"
+    set "JBOSS_JAVA_SIZING=-Xms64M -Xmx512M"
 )
 set "JAVA_OPTS=%JBOSS_JAVA_SIZING%"
 
diff --git a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1 b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1
index 8bca296a6d2..ef4e3f527ef 100644
--- a/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1
+++ b/core-feature-pack/common/src/main/resources/content/bin/standalone.conf.ps1
@@ -39,7 +39,7 @@ if (-Not $JAVA_OPTS) {
     $JAVA_OPTS = @()
 
     if (-Not(test-path env:JBOSS_JAVA_SIZING)) {
-        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M -XX:MetaspaceSize=96M"
+        $env:JBOSS_JAVA_SIZING = "-Xms64M -Xmx512M"
     }
     $JAVA_OPTS += String-To-Array($env:JBOSS_JAVA_SIZING)
 
diff --git a/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml b/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml
index a2fcedd5e8c..8da8681aba4 100644
--- a/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml
+++ b/core-feature-pack/galleon-common/src/main/resources/feature_groups/host-jvm.xml
@@ -10,6 +10,6 @@
         <param name="heap-size" value="64m"/>
         <param name="max-heap-size" value="256m"/>
         <param name="environment-variables" value="{MALLOC_ARENA_MAX=1}"/>
-        <param name="jvm-options" value="[&quot;-server&quot;,&quot;-XX:MetaspaceSize=96m&quot;]"/>
+        <param name="jvm-options" value="[&quot;-server&quot;]"/>
     </feature>
 </feature-group-spec>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml
index e276864a19d..fb847d86757 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron-no-legacy-realms.xml
@@ -65,7 +65,6 @@
             <heap size="64m" max-size="200m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
index f918c985330..3fc90d76cbc 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-primary-elytron.xml
@@ -54,7 +54,6 @@
             <heap size="64m" max-size="200m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml
index c8194287575..d81bba42572 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-1way-elytron.xml
@@ -56,7 +56,6 @@
             <heap size="64m" max-size="256m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml
index db3b7c5352b..6602e03faf9 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-primary-ssl-2way-elytron.xml
@@ -56,7 +56,6 @@
             <heap size="64m" max-size="256m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml
index ed64adf15f6..87d3a0c285f 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-secondary-elytron-no-legacy-realms.xml
@@ -67,7 +67,6 @@
             <heap size="64m" max-size="128m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml
index 0764bdc0a27..243b8e0a556 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-1way-elytron.xml
@@ -73,7 +73,6 @@
             <heap size="64m" max-size="256m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml
index 2709b2f0294..ffff39bc8b4 100644
--- a/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml
+++ b/testsuite/domain/src/test/resources/host-configs/host-secondary-ssl-2way-elytron.xml
@@ -73,7 +73,6 @@
             <heap size="64m" max-size="256m"/>
             <jvm-options>
                 <option value="-server"/>
-                <option value="-XX:MetaspaceSize=96m"/>
             </jvm-options>
         </jvm>
     </jvms>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 19e3fd323a9..a9c46177001 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -117,7 +117,7 @@
 
 
         <!-- Common surefire properties. -->
-        <surefire.memory.args>-Xmx512m -XX:MetaspaceSize=128m</surefire.memory.args>
+        <surefire.memory.args>-Xmx512m</surefire.memory.args>
         <surefire.jpda.args></surefire.jpda.args>
         <as.debug.port>8787</as.debug.port>
         <surefire.jvm.args>${surefire.memory.args} ${modular.jdk.args} ${modular.jdk.props} -Djboss.dist=${jboss.dist} ${surefire.jacoco.args} -Djava.io.tmpdir=${project.build.directory}</surefire.jvm.args>