diff --git a/jee-7/pom.xml b/jee-7/pom.xml
index a59733fe6e..b0e10c1580 100644
--- a/jee-7/pom.xml
+++ b/jee-7/pom.xml
@@ -274,10 +274,6 @@
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
-            <properties>
-                <serverProfile>standalone-full.xml</serverProfile>
-                <serverRoot>${project.build.directory}/wildfly-${wildfly.version}</serverRoot>
-            </properties>
             <dependencies>
                 <dependency>
                     <groupId>io.undertow</groupId>
@@ -347,15 +343,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${maven-surefire-plugin.version}</version>
-                        <configuration>
-                            <environmentVariables>
-                                <JBOSS_HOME>${project.build.directory}/wildfly-${wildfly.version}</JBOSS_HOME>
-                            </environmentVariables>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>
diff --git a/jee-7/src/test/resources/arquillian.xml b/jee-7/src/test/resources/arquillian.xml
new file mode 100644
index 0000000000..f4274877fd
--- /dev/null
+++ b/jee-7/src/test/resources/arquillian.xml
@@ -0,0 +1,23 @@
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation=" http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+    <container qualifier="wildfly-managed" default="true">
+        <configuration>
+            <property name="jbossHome">target/wildfly-8.2.1.Final</property>
+            <property name="serverConfig">standalone.xml</property>
+            <property name="outputToConsole">true</property>
+            <property name="managementPort">9990</property>
+            <property name="javaVmArguments">-Djboss.http.port=8639</property>
+        </configuration>
+    </container>
+
+    <container qualifier="wildfly-remote">
+        <configuration>
+            <property name="managementAddress">127.0.0.1</property>
+            <property name="managementPort">9990</property>
+            <property name="username">admin</property>
+            <property name="password">pass</property>
+            <property name="allowConnectingToRunningServer">true</property>
+        </configuration>
+    </container>
+
+</arquillian>
\ No newline at end of file