diff --git a/testsuite/integration-arquillian/servers/eap6/assembly.xml b/testsuite/integration-arquillian/servers/eap6/assembly.xml
deleted file mode 100644
index 537dd4ea25..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/assembly.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<assembly>
-    
-    <id>auth-server-eap6</id>
-
-    <formats>
-        <format>zip</format>
-    </formats>
-
-    <includeBaseDirectory>false</includeBaseDirectory>
-
-    <fileSets>
-        <fileSet>
-            <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-${project.version}</outputDirectory>
-            <excludes>
-                <exclude>**/*.sh</exclude>
-            </excludes>
-        </fileSet>
-        <fileSet>
-            <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-${project.version}</outputDirectory>
-            <includes>
-                <include>**/*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
-    </fileSets>
-
-</assembly>
diff --git a/testsuite/integration-arquillian/servers/eap6/pom.xml b/testsuite/integration-arquillian/servers/eap6/pom.xml
deleted file mode 100644
index b13f519045..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/pom.xml
+++ /dev/null
@@ -1,250 +0,0 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <parent>
-        <groupId>org.keycloak.testsuite</groupId>
-        <artifactId>integration-arquillian-servers</artifactId>
-        <version>1.9.0.CR1-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>integration-arquillian-server-eap6</artifactId>
-    <packaging>pom</packaging>
-    <name>Server on EAP 6</name>
-    
-    <properties>
-        <keycloak.server.home>${project.build.directory}/unpacked/jboss-eap-6.4</keycloak.server.home>
-    </properties>
-            
-    <dependencies>
-        <dependency>
-            <groupId>org.jboss.as</groupId>
-            <artifactId>jboss-as-dist</artifactId>
-            <version>${jboss.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-server-overlay-eap6</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-eap6-adapter-dist</artifactId>
-            <type>zip</type>
-        </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-saml-eap6-adapter-dist</artifactId>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-            
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>            
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>unpack-eap6-and-server-overlay</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.jboss.as</groupId>
-                                    <artifactId>jboss-as-dist</artifactId>
-                                    <version>${jboss.version}</version>
-                                    <type>zip</type>
-                                    <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>org.keycloak</groupId>
-                                    <artifactId>keycloak-server-overlay-eap6</artifactId>
-                                    <version>${project.version}</version>
-                                    <type>zip</type>
-                                    <outputDirectory>${keycloak.server.home}</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <id>move-standalone-keycloak-xml</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <move file="${keycloak.server.home}/standalone/configuration/standalone-keycloak.xml" 
-                                      tofile="${keycloak.server.home}/standalone/configuration/standalone.xml"/>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>create-zip</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>assembly.xml</descriptor>
-                            </descriptors>
-                            <appendAssemblyId>false</appendAssemblyId>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    
-    <profiles>
-        <profile>
-            <id>adapter-libs-provided</id>
-            <activation>    
-                <property>
-                    <name>!adapter.libs.bundled</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-dependency-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>unpack-adapter</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>unpack</goal>
-                                </goals>
-                                <configuration>
-                                    <artifactItems>
-                                        <artifactItem>
-                                            <groupId>org.keycloak</groupId>
-                                            <artifactId>keycloak-eap6-adapter-dist</artifactId>
-                                            <version>${project.version}</version>
-                                            <type>zip</type>
-                                            <outputDirectory>${keycloak.server.home}</outputDirectory>
-                                        </artifactItem>
-                                    </artifactItems>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>xml-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>configure-adapter-subsystem</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <transformationSets>
-                                        <transformationSet>
-                                            <dir>${keycloak.server.home}/standalone/configuration</dir>
-                                            <includes>
-                                                <include>standalone.xml</include>
-                                            </includes>
-                                            <stylesheet>src/main/xslt/standalone.xsl</stylesheet>
-                                            <outputDir>${keycloak.server.home}/standalone/configuration</outputDir>
-                                        </transformationSet>
-                                    </transformationSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>ssl</id>
-            <activation>
-                <property>
-                    <name>auth.server.ssl.required</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>xml-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>configure-adapter-subsystem-security</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>transform</goal>
-                                </goals>
-                                <configuration>
-                                    <transformationSets>
-                                        <transformationSet>
-                                            <dir>${keycloak.server.home}/standalone/configuration</dir>
-                                            <includes>
-                                                <include>standalone.xml</include>
-                                            </includes>
-                                            <stylesheet>src/main/xslt/security.xsl</stylesheet>
-                                            <outputDir>${keycloak.server.home}/standalone/configuration</outputDir>
-                                        </transformationSet>
-                                    </transformationSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
-                        <executions>
-                            <execution>
-                                <id>copy-keystore</id>
-                                <phase>process-resources</phase>
-                                <goals>
-                                    <goal>copy-resources</goal>
-                                </goals>
-                                <configuration>
-                                     <outputDirectory>${keycloak.server.home}/standalone/configuration</outputDirectory>
-                                     <resources>
-                                         <resource>
-                                              <directory>src/main/keystore</directory>
-                                              <includes>
-                                                  <include>keycloak.jks</include>
-                                                  <include>keycloak.truststore</include>
-                                              </includes>
-                                         </resource>
-                                     </resources>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-</project>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks b/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks
deleted file mode 100644
index 81570ab529..0000000000
Binary files a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.jks and /dev/null differ
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore b/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore
deleted file mode 100644
index 2df5170f9b..0000000000
Binary files a/testsuite/integration-arquillian/servers/eap6/src/main/keystore/keycloak.truststore and /dev/null differ
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl
deleted file mode 100644
index c06899fd74..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/datasource.xsl
+++ /dev/null
@@ -1,94 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:j="urn:jboss:domain:3.0"
-                xmlns:ds="urn:jboss:domain:datasources:3.0"
-                xmlns:k="urn:jboss:domain:keycloak:1.1"
-                xmlns:sec="urn:jboss:domain:security:1.2"
-                version="2.0"
-                exclude-result-prefixes="xalan j ds k sec">
-
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
-    <xsl:strip-space elements="*"/>
-
-
-    <xsl:variable name="nsDS" select="'urn:jboss:domain:datasources:'"/>
-    
-    <!-- Remove keycloak datasource definition. -->
-    <xsl:template match="//*[local-name()='subsystem' and starts-with(namespace-uri(), $nsDS)]
-		         /*[local-name()='datasources' and starts-with(namespace-uri(), $nsDS)]
-                         /*[local-name()='datasource' and starts-with(namespace-uri(), $nsDS) and @pool-name='KeycloakDS']">
-    </xsl:template>
-    
-    <xsl:param name="jdbc.url" select="'jdbc:h2:${jboss.server.data.dir}/keycloak;AUTO_SERVER=TRUE'"/>
-    <xsl:param name="driver" select="'h2'"/>
-    
-    <xsl:param name="username" select="'sa'"/>
-    <xsl:param name="password" select="'sa'"/>
-    
-    <xsl:param name="min.poolsize" select="'10'"/>
-    <xsl:param name="max.poolsize" select="'50'"/>
-    <xsl:param name="pool.prefill" select="'true'"/>
-    
-    <xsl:variable name="newDatasourceDefinition">
-        <datasource jndi-name="java:jboss/datasources/KeycloakDS" pool-name="KeycloakDS" enabled="true" use-java-context="true">
-            <connection-url>
-                <xsl:value-of select="$jdbc.url"/>
-            </connection-url>
-            <driver>
-                <xsl:value-of select="$driver"/>
-            </driver>
-            <security>
-                <user-name>
-                    <xsl:value-of select="$username"/>
-                </user-name>
-                <password>
-                    <xsl:value-of select="$password"/>
-                </password>
-            </security>
-            <pool>
-                <min-pool-size>
-                    <xsl:value-of select="$min.poolsize"/>
-                </min-pool-size>
-                <max-pool-size>
-                    <xsl:value-of select="$max.poolsize"/>
-                </max-pool-size>
-                <prefill>
-                    <xsl:value-of select="$pool.prefill"/>
-                </prefill>
-            </pool>
-        </datasource>
-    </xsl:variable>
-    
-    <xsl:variable name="newDriverDefinition">
-        <xsl:if test="$driver != 'h2'">
-            <driver name="{$driver}" module="com.{$driver}" />
-        </xsl:if>
-    </xsl:variable>
-    
-    <!-- Add new datasource definition. -->
-    <xsl:template match="//*[local-name()='subsystem' and starts-with(namespace-uri(), $nsDS)]
-		         /*[local-name()='datasources' and starts-with(namespace-uri(), $nsDS)]">
-        <xsl:copy>
-            <xsl:copy-of select="$newDatasourceDefinition"/>
-            <xsl:apply-templates select="@* | node()" />
-        </xsl:copy>
-    </xsl:template>
-    
-    <!-- Add new driver definition. -->
-    <xsl:template match="//*[local-name()='subsystem' and starts-with(namespace-uri(), $nsDS)]
-		         /*[local-name()='datasources' and starts-with(namespace-uri(), $nsDS)]
-		         /*[local-name()='drivers' and starts-with(namespace-uri(), $nsDS)]">
-        <xsl:copy>
-            <xsl:copy-of select="$newDriverDefinition"/>
-            <xsl:apply-templates select="@* | node()" />
-        </xsl:copy>
-    </xsl:template>
-    
-    <!-- Copy everything else. -->
-    <xsl:template match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:copy>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl
deleted file mode 100644
index 88ac56b86c..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/module.xsl
+++ /dev/null
@@ -1,33 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:m="urn:jboss:module:1.3"
-                version="2.0"
-                exclude-result-prefixes="xalan m">
-
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" />
-    
-       
-    <xsl:param name="database" select="''"/>
-    <xsl:param name="version" select="''"/>
-    
-    <xsl:variable name="newModuleDefinition">
-        <module xmlns="urn:jboss:module:1.3" name="com.{$database}">
-            <resources>
-                <resource-root path="{$database}-{$version}.jar"/>
-            </resources>
-            <dependencies>
-                <module name="javax.api"/>
-                <module name="javax.transaction.api"/>
-            </dependencies>
-        </module>
-    </xsl:variable>
-    
-    <!-- clear whole document -->
-    <xsl:template match="/*" />
-    
-    <!-- Copy new module definition. -->
-    <xsl:template match="/*">
-        <xsl:copy-of select="$newModuleDefinition"/>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl
deleted file mode 100644
index 4c9667361d..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/security.xsl
+++ /dev/null
@@ -1,34 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:j="urn:jboss:domain:1.7"
-                xmlns:w="urn:jboss:domain:web:2.2"
-                version="2.0"
-                exclude-result-prefixes="xalan j ds k sec">
-
-    <xsl:param name="config"/>
-
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match="//w:connector[@name='http']">
-        <xsl:copy-of select="."/>
-        <connector name="https" protocol="HTTP/1.1" scheme="https" socket-binding="https" secure="true">
-                <ssl name="https" password="secret" certificate-key-file="${{jboss.server.config.dir}}/keycloak.jks"/>
-            </connector>
-    </xsl:template>
-
-    <xsl:template match="//j:extensions">
-         <xsl:copy-of select="."/>
-         <system-properties>
-             <property name="javax.net.ssl.trustStore" value="${{jboss.server.config.dir}}/keycloak.truststore"/>
-             <property name="javax.net.ssl.trustStorePassword" value="secret"/>
-         </system-properties>
-    </xsl:template>
-
-    <xsl:template match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:copy>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl b/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl
deleted file mode 100644
index c0df283ac9..0000000000
--- a/testsuite/integration-arquillian/servers/eap6/src/main/xslt/standalone.xsl
+++ /dev/null
@@ -1,53 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xalan="http://xml.apache.org/xalan"
-                xmlns:j="urn:jboss:domain:1.7"
-                xmlns:ds="urn:jboss:domain:datasources:1.2"
-                xmlns:k="urn:jboss:domain:keycloak:1.1"
-                xmlns:sec="urn:jboss:domain:security:1.1"
-                version="2.0"
-                exclude-result-prefixes="xalan j ds k sec">
-
-    <xsl:param name="config"/>
-
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" xalan:indent-amount="4" standalone="no"/>
-    <xsl:strip-space elements="*"/>
-
-    <xsl:template match="//j:extensions">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-            <extension module="org.keycloak.keycloak-adapter-subsystem"/>
-            <extension module="org.keycloak.keycloak-saml-adapter-subsystem"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="//j:profile">
-        <xsl:copy>
-            <xsl:apply-templates select="node()|@*"/>
-            <subsystem xmlns="urn:jboss:domain:keycloak:1.1"/>
-            <subsystem xmlns="urn:jboss:domain:keycloak-saml:1.1"/>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="//sec:security-domains">
-        <xsl:copy>
-            <xsl:apply-templates select="node()[name(.)='security-domain']"/>
-            <security-domain name="keycloak">
-                <authentication>
-                    <login-module code="org.keycloak.adapters.jboss.KeycloakLoginModule" flag="required"/>
-                </authentication>
-            </security-domain>
-            <security-domain name="sp" cache-type="default">
-                <authentication>
-                    <login-module code="org.picketlink.identity.federation.bindings.wildfly.SAML2LoginModule" flag="required"/>
-                </authentication>
-            </security-domain>
-        </xsl:copy>
-    </xsl:template>
-
-    <xsl:template match="@*|node()">
-        <xsl:copy>
-            <xsl:apply-templates select="@*|node()" />
-        </xsl:copy>
-    </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/testsuite/integration-arquillian/servers/eap7/assembly.xml b/testsuite/integration-arquillian/servers/eap7/assembly.xml
index 5fcf9890f2..98df2c8e54 100644
--- a/testsuite/integration-arquillian/servers/eap7/assembly.xml
+++ b/testsuite/integration-arquillian/servers/eap7/assembly.xml
@@ -11,14 +11,14 @@
     <fileSets>
         <fileSet>
             <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-${version.eap6.server.dist}</outputDirectory>
+            <outputDirectory>keycloak-${version.server.dist}</outputDirectory>
             <excludes>
                 <exclude>**/*.sh</exclude>
             </excludes>
         </fileSet>
         <fileSet>
             <directory>${keycloak.server.home}</directory>
-            <outputDirectory>keycloak-${version.eap6.server.dist}</outputDirectory>
+            <outputDirectory>keycloak-${version.server.dist}</outputDirectory>
             <includes>
                 <include>**/*.sh</include>
             </includes>
diff --git a/testsuite/integration-arquillian/servers/eap7/pom.xml b/testsuite/integration-arquillian/servers/eap7/pom.xml
index b4fdeb1850..67110ef600 100644
--- a/testsuite/integration-arquillian/servers/eap7/pom.xml
+++ b/testsuite/integration-arquillian/servers/eap7/pom.xml
@@ -52,7 +52,7 @@
                 <dependency>
                     <groupId>org.keycloak</groupId>
                     <artifactId>keycloak-eap6-server-dist</artifactId>
-                    <version>${version.eap6.server.dist}</version>
+                    <version>${version.server.dist}</version>
                     <type>zip</type>
                 </dependency>
             </dependencies>
@@ -70,7 +70,7 @@
                                 <configuration>
                                     <rules>
                                         <requireProperty>
-                                            <property>version.eap6.server.dist</property>
+                                            <property>version.server.dist</property>
                                         </requireProperty>
                                     </rules>
                                 </configuration>
@@ -92,7 +92,7 @@
                                         <artifactItem>
                                             <groupId>org.keycloak</groupId>
                                             <artifactId>keycloak-eap6-server-dist</artifactId>
-                                            <version>${version.eap6.server.dist}</version>
+                                            <version>${version.server.dist}</version>
                                             <type>zip</type>
                                             <outputDirectory>${project.build.directory}/unpacked</outputDirectory>
                                         </artifactItem>
diff --git a/testsuite/integration-arquillian/servers/pom.xml b/testsuite/integration-arquillian/servers/pom.xml
index 5da7a38ec1..c91ada581d 100644
--- a/testsuite/integration-arquillian/servers/pom.xml
+++ b/testsuite/integration-arquillian/servers/pom.xml
@@ -23,13 +23,6 @@
                 <module>wildfly</module>
             </modules>
         </profile>
-        <profile>
-            <id>auth-server-eap6</id>
-            <modules>
-                <!--doesn't work yet, WIP-->
-                <module>eap6</module>
-            </modules>
-        </profile>
         <profile>
             <id>auth-server-eap7</id>
             <modules>
diff --git a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
index 60b3ceb4b2..afc3334429 100644
--- a/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
+++ b/testsuite/integration-arquillian/tests/base/src/test/resources/arquillian.xml
@@ -123,26 +123,13 @@
         </configuration>
     </container>
     
-    <container qualifier="auth-server-eap6" mode="suite" >
-        <configuration>
-            <property name="enabled">${auth.server.eap6}</property>
-            <property name="adapterImplClass">org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</property>
-            <property name="jbossHome">${keycloak.home}</property>
-            <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
-            <property name="managementAddress">localhost</property>
-            <property name="managementPort">${auth.server.management.port.jmx}</property>
-            <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
-        </configuration>
-    </container>
-    
     <container qualifier="auth-server-eap7" mode="suite" >
         <configuration>
             <property name="enabled">${auth.server.eap7}</property>
             <property name="adapterImplClass">org.jboss.as.arquillian.container.managed.ManagedDeployableContainer</property>
             <property name="jbossHome">${keycloak.home}</property>
             <property name="javaVmArguments">-Djboss.socket.binding.port-offset=${auth.server.port.offset} -Xms64m -Xmx512m -XX:MaxPermSize=256m ${adapter.test.props}</property>
-            <property name="managementAddress">localhost</property>
-            <property name="managementPort">${auth.server.management.port.jmx}</property>
+            <property name="managementPort">${auth.server.management.port}</property>
             <property name="startupTimeoutInSeconds">${startup.timeout.sec}</property>
         </configuration>
     </container>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index 03aa8ec951..f8c817e618 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -471,42 +471,6 @@
             </build>
         </profile>
         
-        <profile>
-            <id>auth-server-eap6</id>
-            <properties>
-                <skip.unpack.server>false</skip.unpack.server>
-                <server.artifactId>integration-arquillian-server-eap6</server.artifactId>
-                <auth.server.container>auth-server-eap6</auth.server.container>
-                <startup.timeout.sec>300</startup.timeout.sec>
-                <adapter.test.props/>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.2.0.Final</version>
-                </dependency>
-            </dependencies>
-            <build>
-                <pluginManagement>
-                    <plugins>
-                        <plugin>
-                            <groupId>org.apache.maven.plugins</groupId>
-                            <artifactId>maven-surefire-plugin</artifactId>
-                            <configuration>
-                                <systemPropertyVariables>
-                                    <auth.server.eap6>true</auth.server.eap6>
-                                    <auth.server.undertow>false</auth.server.undertow>
-                                    <keycloak.home>${containers.home}/keycloak-${project.version}</keycloak.home>
-                                    <adapter.test.props>${adapter.test.props}</adapter.test.props>
-                                </systemPropertyVariables>
-                            </configuration>
-                        </plugin>
-                    </plugins>
-                </pluginManagement>
-            </build>
-        </profile>
-        
         <profile>
             <id>auth-server-eap7</id>
             <properties>
@@ -515,22 +479,15 @@
                 <auth.server.container>auth-server-eap7</auth.server.container>
                 <startup.timeout.sec>300</startup.timeout.sec>
                 <adapter.test.props/>
-                <keycloak.home>${containers.home}/keycloak-${version.eap6.server.dist}</keycloak.home>
+                <keycloak.home>${containers.home}/keycloak-${version.server.dist}</keycloak.home>
                 <jboss.server.config.dir>${keycloak.home}/standalone/configuration</jboss.server.config.dir>
             </properties>
             <dependencies>
-                <dependency>
-                    <groupId>org.jboss.as</groupId>
-                    <artifactId>jboss-as-arquillian-container-managed</artifactId>
-                    <version>7.2.0.Final</version>
-                </dependency>
-            </dependencies>
-            <!--            <dependencies>
                 <dependency>
                     <groupId>org.wildfly</groupId>
                     <artifactId>wildfly-arquillian-container-managed</artifactId>
                 </dependency>
-            </dependencies>-->
+            </dependencies>
             <build>
                 <pluginManagement>
                     <plugins>
@@ -546,7 +503,7 @@
                                     <configuration>
                                         <rules>
                                             <requireProperty>
-                                                <property>version.eap6.server.dist</property>
+                                                <property>version.server.dist</property>
                                             </requireProperty>
                                         </rules>
                                     </configuration>