diff --git a/pom.xml b/pom.xml
index 7e78da7611..6b77469412 100755
--- a/pom.xml
+++ b/pom.xml
@@ -150,7 +150,11 @@
         <docker.maven.plugin.version>0.28.0</docker.maven.plugin.version>
 
         <!-- Surefire Settings -->
-        <surefire.memory.settings>-Xms512m -Xmx2048m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
+        <surefire.memory.Xms>512m</surefire.memory.Xms>
+        <surefire.memory.Xmx>2048m</surefire.memory.Xmx>
+        <surefire.memory.metaspace>96m</surefire.memory.metaspace>
+        <surefire.memory.metaspace.max>256m</surefire.memory.metaspace.max>
+        <surefire.memory.settings>-Xms${surefire.memory.Xms} -Xmx${surefire.memory.Xmx} -XX:MetaspaceSize=${surefire.memory.metaspace} -XX:MaxMetaspaceSize=${surefire.memory.metaspace.max}</surefire.memory.settings>
 
         <!-- Tomcat versions -->
         <tomcat7.version>7.0.92</tomcat7.version>
@@ -1499,8 +1503,7 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <forkMode>once</forkMode>
-                        <argLine>${surefire.memory.settings}</argLine>
-                        <argLine>-Djava.awt.headless=true</argLine>
+                        <argLine>-Djava.awt.headless=true ${surefire.memory.settings}</argLine>
                     </configuration>
                 </plugin>
                 <plugin>
diff --git a/testsuite/integration-arquillian/tests/base/pom.xml b/testsuite/integration-arquillian/tests/base/pom.xml
index 845fbc440a..eb1393f712 100644
--- a/testsuite/integration-arquillian/tests/base/pom.xml
+++ b/testsuite/integration-arquillian/tests/base/pom.xml
@@ -943,7 +943,7 @@
             <properties>
                 <skip.clean.second.cache>false</skip.clean.second.cache>
                 <exclude.crossdc>-</exclude.crossdc>
-                <surefire.memory.settings>-Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
+                <surefire.memory.Xmx>1024m</surefire.memory.Xmx>
             </properties>
         </profile>
         <profile>
@@ -952,7 +952,7 @@
                 <skip.clean.second.cache>false</skip.clean.second.cache>
                 <skip.copy.auth.crossdc.nodes>false</skip.copy.auth.crossdc.nodes>
                 <exclude.crossdc>-</exclude.crossdc>
-                <surefire.memory.settings>-Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
+                <surefire.memory.Xmx>1024m</surefire.memory.Xmx>
             </properties>
         </profile>
     </profiles>
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java
index fff390d6d2..d1da336c40 100644
--- a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/arquillian/AuthServerTestEnricher.java
@@ -41,6 +41,7 @@ import org.keycloak.testsuite.arquillian.annotation.UncaughtServerErrorExpected;
 import org.keycloak.testsuite.client.KeycloakTestingClient;
 import org.keycloak.testsuite.util.LogChecker;
 import org.keycloak.testsuite.util.OAuthClient;
+import org.keycloak.testsuite.util.SystemInfoHelper;
 import org.wildfly.extras.creaper.commands.undertow.AddUndertowListener;
 import org.wildfly.extras.creaper.commands.undertow.RemoveUndertowListener;
 import org.wildfly.extras.creaper.commands.undertow.SslVerifyClient;
@@ -289,6 +290,7 @@ public class AuthServerTestEnricher {
         suiteContextProducer.set(suiteContext);
         CrossDCTestEnricher.initializeSuiteContext(suiteContext);
         log.info("\n\n" + suiteContext);
+        log.info("\n\n" + SystemInfoHelper.getSystemInfo());
     }
 
     private ContainerInfo updateWithAuthServerInfo(ContainerInfo authServerInfo) {
diff --git a/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SystemInfoHelper.java b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SystemInfoHelper.java
new file mode 100644
index 0000000000..441b69f9c2
--- /dev/null
+++ b/testsuite/integration-arquillian/tests/base/src/main/java/org/keycloak/testsuite/util/SystemInfoHelper.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2017 Red Hat, Inc. and/or its affiliates
+ * and other contributors as indicated by the @author tags.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.keycloak.testsuite.util;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
+
+
+/**
+ * Provides some data about CPU and Memory of the java process used for the testsuite
+ *
+ * @author <a href="mailto:mposolda@redhat.com">Marek Posolda</a>
+ */
+public class SystemInfoHelper {
+
+    public static String getSystemInfo() {
+        Runtime runtime = Runtime.getRuntime();
+
+        StringBuilder s = new StringBuilder("TEST PROCESS INFO: ");
+        s.append("\nAvailable processors: " + runtime.availableProcessors());
+        s.append("\nTotal memory: " + toMB(runtime.totalMemory()));
+        s.append("\nMax memory (Xmx): " + toMB(runtime.maxMemory()));
+
+        for (MemoryPoolMXBean memoryMXBean : ManagementFactory.getMemoryPoolMXBeans()) {
+            if ("Metaspace".equalsIgnoreCase(memoryMXBean.getName())) {
+                s.append("\nMetaspace Max: " + toMB(memoryMXBean.getUsage().getMax()));
+            }
+        }
+
+        return s.toString();
+    }
+
+
+    private static String toMB(long bytes) {
+        return bytes / 1024 / 1024 + " MB";
+    }
+
+}
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index e70dadbf39..b4b2568024 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -643,7 +643,7 @@
                 <auth.server.config.property.value>standalone.xml</auth.server.config.property.value>
                 <auth.server.config.dir>${auth.server.home}/standalone/configuration</auth.server.config.dir>
                 <h2.version>1.3.173</h2.version>
-                <surefire.memory.settings>-Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
+                <surefire.memory.Xmx>1024m</surefire.memory.Xmx>
             </properties>
             <dependencies>
                 <dependency>
@@ -668,7 +668,7 @@
                 <auth.server.config.property.value>standalone.xml</auth.server.config.property.value>
                 <auth.server.config.dir>${auth.server.home}/standalone/configuration</auth.server.config.dir>
                 <h2.version>1.3.173</h2.version>
-                <surefire.memory.settings>-Xms512m -Xmx1024m -XX:MetaspaceSize=96m -XX:MaxMetaspaceSize=256m</surefire.memory.settings>
+                <surefire.memory.Xmx>1024m</surefire.memory.Xmx>
             </properties>
             <dependencies>
                 <dependency>