diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 5eae89d6d6..2bf339f20f 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -15,17 +15,14 @@
     <selenium.version>2.39.0</selenium.version>
 
     <!--Cargo Settings -->
-    <cargo.wait>false</cargo.wait>
     <cargo.host>localhost</cargo.host>
-    <cargo.container>jboss72x</cargo.container>
     <!--jboss port offset -->
     <cargo.port.offset>0</cargo.port.offset>
     <!-- This may be changed by the JBOSS_HTTP_PORT profile -->
+    <!-- This needs to agree with the http socket-binding in standalone.xml -->
     <cargo.servlet.port>8180</cargo.servlet.port>
-    <cargo.installation>http://downloads.sourceforge.net/project/zanata/server/zanata-server.zip</cargo.installation>
     <cargo.extract.dir>${project.build.directory}/cargo/installs</cargo.extract.dir>
     <cargo.container.home>${project.build.directory}/jboss/container</cargo.container.home>
-    <cargo.install.relative.to.container.home>../../cargo/installs/zanata-server</cargo.install.relative.to.container.home>
     <context.path>zanata</context.path>
 
     <!--data source-->
@@ -61,7 +58,8 @@
       -Xnoagent -Djava.compiler=NONE
     </cargo.debug.jvm.args>
     <!-- this property can be used to control what test needs to be run by failsafe -->
-    <include.test.patterns>**/AggregateTestSuite.java</include.test.patterns>
+    <default.test.patterns>**/BasicAcceptanceTestSuite.java</default.test.patterns>
+    <include.test.patterns>${default.test.patterns}</include.test.patterns>
     <hibernate.search.default.indexBase>${project.build.directory}/zanataindex</hibernate.search.default.indexBase>
     <javamelody.storage-directory>${project.build.directory}/zanatastats</javamelody.storage-directory>
     <!-- This may be changed by the SMTP_PORT profile -->
@@ -336,8 +334,6 @@
         </property>
       </activation>
       <properties>
-        <cargo.container>wildfly8x</cargo.container>
-        <cargo.installation>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</cargo.installation>
         <standalone.xml.file>standalone_wildfly.xml</standalone.xml.file>
         <jndi-remote-client.groupId>org.wildfly</jndi-remote-client.groupId>
         <jndi-remote-client.artifactId>wildfly-ejb-client-bom</jndi-remote-client.artifactId>
@@ -346,43 +342,22 @@
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <configuration>
-              <usedDependencies>
-                <usedDependency>org.wildfly:wildfly-ejb-client-bom</usedDependency>
-              </usedDependencies>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.cargo</groupId>
-            <artifactId>cargo-maven2-plugin</artifactId>
-            <configuration combine.self="append">
-            </configuration>
+            <artifactId>maven-antrun-plugin</artifactId>
             <executions>
               <execution>
-                <id>cargo-install</id>
-                <phase>prepare-package</phase>
-                <goals>
-                  <goal>install</goal>
-                </goals>
+                <id>install-wildfly-modules</id>
+                <phase>package</phase>
               </execution>
             </executions>
           </plugin>
+
           <plugin>
-            <groupId>org.codehaus.gmaven</groupId>
-            <artifactId>gmaven-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-wildfly-modules</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>execute</goal>
-                </goals>
-                <configuration>
-                  <source>${pom.basedir}/src/etc/wildflyModules.groovy</source>
-                </configuration>
-              </execution>
-            </executions>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <configuration>
+              <usedDependencies>
+                <usedDependency>org.wildfly:wildfly-ejb-client-bom</usedDependency>
+              </usedDependencies>
+            </configuration>
           </plugin>
         </plugins>
       </build>
@@ -403,11 +378,63 @@
         </dependencies>
       </dependencyManagement>
     </profile>
+
+    <profile>
+      <id>skipFuncTests</id>
+      <activation>
+        <property>
+          <name>skipFuncTests</name>
+        </property>
+      </activation>
+      <properties>
+        <skipITs>true</skipITs>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>allFuncTests</id>
+      <activation>
+        <property>
+          <name>allFuncTests</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <properties>
+        <include.test.patterns>**/DetailedTestSuite.java</include.test.patterns>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>check-tests-enabled</id>
+                <phase>validate</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target xmlns:if="ant:if">
+                    <echo if:set="skipFuncTests"
+                      message="WARNING: -DskipFuncTests takes precedence over -DallFuncTests" />
+                    <echo if:set="skipITs"
+                      message="WARNING: -DskipITs takes precedence over -DallFuncTests" />
+                    <echo if:set="skipTests"
+                      message="WARNING: -DskipTests takes precedence over -DallFuncTests" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>run-functional-test</id>
       <activation>
         <property>
-          <name>functional-test</name>
+          <name>!skipFuncTests</name>
         </property>
       </activation>
       <build>
@@ -517,17 +544,6 @@
             <groupId>org.codehaus.cargo</groupId>
             <artifactId>cargo-maven2-plugin</artifactId>
             <configuration combine.self="append">
-              <container>
-                <systemProperties>
-                  <zanata.countAjax>true</zanata.countAjax>
-                </systemProperties>
-                <!--if install from url-->
-                <zipUrlInstaller>
-                  <url>${cargo.installation}</url>
-                  <downloadDir>${user.home}/Downloads</downloadDir>
-                  <extractDir>${cargo.extract.dir}</extractDir>
-                </zipUrlInstaller>
-              </container>
               <configuration>
                 <properties>
                   <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
@@ -547,6 +563,10 @@
               </deployables>
             </configuration>
             <executions>
+              <execution>
+                <id>cargo-install</id>
+                <phase>prepare-package</phase>
+              </execution>
               <execution>
                 <id>cargo-start</id>
                 <phase>pre-integration-test</phase>
@@ -566,21 +586,6 @@
 
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.11</version>
-            <executions>
-              <execution>
-                <id>integration-test</id>
-                <goals>
-                  <goal>integration-test</goal>
-                </goals>
-              </execution>
-              <execution>
-                <id>verify</id>
-                <goals>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
             <configuration>
               <redirectTestOutputToFile>false</redirectTestOutputToFile>
               <printSummary>true</printSummary>
@@ -588,8 +593,6 @@
               <!--<forkMode>always</forkMode>-->
               <includes>
                 <include>${include.test.patterns}</include>
-                <!--index page-->
-                <include>**/FeatureTest.java</include>
               </includes>
               <properties>
                 <property>
@@ -727,6 +730,10 @@
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
+          <execution>
+            <id>init-no-appserver</id>
+            <phase>initialize</phase>
+          </execution>
           <execution>
             <phase>generate-resources</phase>
             <goals>
@@ -735,26 +742,50 @@
             <configuration>
               <target>
                 <echo>===== Properties that can be set for functional test =====</echo>
-                <echo>-Dfunctional-test : to activate functional test run</echo>
+                <echo>-DskipFuncTests : to skip running functional tests, and/or:</echo>
+                <echo>-DskipArqTests : to skip Arquillian integration tests (if building zanata-war)</echo>
+                <echo/>
+                <echo>Unless skipping tests, you must choose an appserver:</echo>
+                <echo>-Dappserver=jbosseap6 -Dcargo.installation=http://example.com/jbosseap632.zip -Dcargo.basename=jbosseap632</echo>
+                <echo>or -Dappserver=wildfly8</echo>
+                <echo>NB: cargo.basename needs to match the basename of the file given in cargo.installation.</echo>
+                <echo>For example, if cargo.installation is http://example.com/download/jboss-6.3.2.zip, cargo.basename should be jboss-6.3.2.</echo>
+                <echo/>
+                <echo>-DallFuncTests to enable all functional tests (defaults to smoke tests)</echo>
+                <echo/>
+                <echo>-Dcargo.debug.jvm.args : If not set by default will listen to port 8787. Need to set to empty on jenkins</echo>
+                <echo/>
                 <echo>-Dzanata.target.version=version of zanata to deploy. Default is: ${project.parent.version}</echo>
                 <echo>-Dzanata.instance.url=http://${cargo.host}:${cargo.servlet.port}/${context.path}</echo>
                 <echo>-Dzanata.apikey=b6d7044e9ee3b2447c28fb7c50d86d98</echo>
                 <!--<echo>-Dzanata.client.version=maven client version to use. Currently: ${zanata.client.version}</echo>-->
                 <echo>-Dzanata.sample.projects.basedir=${project.build.testOutputDirectory}/sample-projects</echo>
-                <echo>-Dcargo.debug.jvm.args : If not set by default will listen to port 8787. Need to set to empty on jenkins</echo>
-                <echo>-Dinclude.test.patterns=test filter pattern. Can be used to control what test to run. Default is **/*AggregateTestSuite.java.</echo>
+                <echo>-Dinclude.test.patterns=test filter pattern. Can be used to control what test to run. Default is ${default.test.patterns}</echo>
                 <echo>-Dwebdriver.type=run tests in htmlUnit, chrome or firefox. For chrome, see also webdriver.chrome.* Default is chrome.</echo>
                 <echo>-Dwebdriver.display=display to run test browser in, for Xnest or otherwise. Default is :0.</echo>
                 <echo>-Dwebdriver.chrome.bin=full path to chrome binary.</echo>
                 <echo>-Dwebdriver.chrome.driver=full path to chromedriver binary.</echo>
                 <echo>-Dwebdriver.wait=global wait time in seconds for element searches. Default is 10.</echo>
                 <echo>==========================================================</echo>
-                <echo>to ask cargo to start up then wait so that tests can be run manually: mvn clean package cargo:run -Dfunctional-test -Dmysql.port=13306</echo>
+                <echo>to ask cargo to start up then wait so that tests can be run manually: mvn clean package cargo:run -Dappserver=wildfly8 -Dmysql.port=13306</echo>
                 <!-- placeholder. Actual content should be populated by running server/etc/scripts/functional-test-db-snapshot.sh -->
                 <touch file="${project.build.directory}/database.sql"/>
               </target>
             </configuration>
           </execution>
+          <execution>
+            <id>preIT-no-appserver</id>
+            <phase>prepare-package</phase>
+            <goals><goal>run</goal></goals>
+            <configuration>
+              <target unless="skipFuncTests">
+                <fail message="'appserver' property must be set to run integration tests (or else use -DskipFuncTests)"
+                  unless="appserver" />
+                <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipFuncTests)"
+                  unless="cargo.installation"/>
+              </target>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -800,7 +831,6 @@
         <!-- this plugin configuration is shared by two profiles: functional-test and wildfly -->
         <configuration>
           <container>
-            <containerId>${cargo.container}</containerId>
             <type>installed</type>
 
             <output>${project.build.directory}/container.log</output>
diff --git a/functional-test/src/etc/wildflyModules.groovy b/functional-test/src/etc/wildflyModules.groovy
deleted file mode 100644
index 240212f518..0000000000
--- a/functional-test/src/etc/wildflyModules.groovy
+++ /dev/null
@@ -1,51 +0,0 @@
-
-def download(String address, File destFile) {
-    def file = new FileOutputStream(destFile)
-    def out = new BufferedOutputStream(file)
-    out << new URL(address).openStream()
-    out.close()
-}
-
-def mojarraUrl = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip/download"
-def hibernateUrl = "http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip/download"
-
-File mojarraZip = new File(project.build.directory, "mojarra.zip")
-File hibernateZip = new File(project.build.directory, "hibernate.zip")
-
-download(mojarraUrl, mojarraZip)
-download(hibernateUrl, hibernateZip)
-
-
-def ant = new AntBuilder()
-
-def mojarraModuleDest = project.build.directory + "/mojarra"
-ant.unzip(src: mojarraZip.absolutePath, dest: mojarraModuleDest, overwrite: "true" )
-def hibernateModuleDest = project.build.directory + "/hibernate"
-ant.unzip(src: hibernateZip.absolutePath, dest: hibernateModuleDest, overwrite: "true" )
-
-File wildFlyInstallRoot = new File(project.properties['cargo.extract.dir'])
-def dirFilter = {
-    it.isDirectory();
-} as FileFilter
-
-def listSubDirs = { File it ->
-    it.listFiles(dirFilter)
-}
-
-def subDirs = listSubDirs(wildFlyInstallRoot)
-File wildFlyRoot;
-while (subDirs.size() == 1) {
-    wildFlyRoot = subDirs[0]
-    subDirs = listSubDirs(wildFlyRoot)
-}
-
-assert wildFlyRoot != null
-println "Wild Fly root is at $wildFlyRoot"
-
-ant.copy(todir: wildFlyRoot, overwrite: true) {
-    fileset(dir: mojarraModuleDest)
-}
-
-ant.copy(todir: wildFlyRoot, overwrite: true) {
-    fileset(dir: hibernateModuleDest)
-}
diff --git a/pom.xml b/pom.xml
index e87ab9d684..b6455e9503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -71,6 +71,11 @@
     <jdbc.version>5.1.26</jdbc.version>
 
     <resteasy.scope>compile</resteasy.scope>
+
+    <cargo.extract.dir>${project.build.directory}/cargo/installs</cargo.extract.dir>
+    <!-- This URL must be set by a profile (wildfly), settings.xml or mvn command line -->
+    <!-- <cargo.installation></cargo.installation> -->
+
   </properties>
 
   <dependencyManagement>
@@ -946,12 +951,94 @@
           </rules>
         </configuration>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>init-no-appserver</id>
+            <!-- submodules should use 'initialize' to activate this -->
+            <phase>none</phase>
+            <goals><goal>run</goal></goals>
+            <configuration combine.self="override">
+              <target unless="skipITs" xmlns:unless="ant:unless">
+                <echo message="appserver: ${appserver} cargo.installation: ${cargo.installation} appserver.home: ${appserver.home}" />
+                <echo message="WARNING: 'appserver' property must be set unless skippping integration tests"
+                  unless:set="appserver" />
+                <echo message="WARNING: 'cargo.installation' property (and possibly cargo.basename) must be set unless skipping integration tests"
+                  unless:set="cargo.installation" />
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
     </plugins>
+
     <pluginManagement>
       <plugins>
+        <!--
+        This is how the Maven lifecycle phases install and configure the appserver:
+
+        prepare-package: download and extract appserver using cargo:install
+        package: download and extract modules using antrun [wildfly only]
+        pre-integration-test: cargo:start [functional tests only]
+        post-integration-test: cargo:stop [functional tests only]
+
+        If 'appserver` is not set, the build will fail in phase
+        'prepare-package'.
+         -->
+        <plugin>
+          <groupId>org.codehaus.cargo</groupId>
+          <artifactId>cargo-maven2-plugin</artifactId>
+          <version>1.4.5</version>
+          <configuration combine.self="append">
+            <container>
+              <containerId>${cargo.container}</containerId>
+              <!--if install from url-->
+              <zipUrlInstaller>
+                <url>${cargo.installation}</url>
+                <downloadDir>${user.home}/Downloads</downloadDir>
+                <extractDir>${cargo.extract.dir}</extractDir>
+              </zipUrlInstaller>
+            </container>
+          </configuration>
+          <executions>
+            <!-- Download and extract app server under target/ -->
+            <!-- NB: This execution needs to be before antrun, because it
+                 creates the wildfly directory for the unzip tasks. -->
+            <!-- TODO use antrun to download and extract appserver? -->
+            <execution>
+              <id>cargo-install</id>
+              <!-- submodules should use 'prepare-package' to activate this -->
+              <phase>none</phase>
+              <goals>
+                <goal>install</goal>
+              </goals>
+            </execution>
+          </executions>
+        </plugin>
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>2.12</version>
+          <configuration>
+            <failIfNoTests>true</failIfNoTests>
+          </configuration>
+          <executions>
+            <execution>
+              <id>integration-test</id>
+              <goals>
+                <goal>integration-test</goal>
+              </goals>
+            </execution>
+            <execution>
+              <id>verify</id>
+              <goals>
+                <goal>verify</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1080,17 +1167,93 @@
       </build>
     </profile>
 
+    <profile>
+      <id>jbosseap6</id>
+      <activation>
+        <property>
+          <name>appserver</name>
+          <value>jbosseap6</value>
+        </property>
+      </activation>
+      <properties>
+        <cargo.container>jboss72x</cargo.container>
+        <!-- name of the top-level dir within the appserver zip -->
+        <appserver.dir.name>jboss-eap-6.3</appserver.dir.name>
+        <!-- where the appserver will be installed -->
+        <appserver.home>${cargo.extract.dir}/${cargo.basename}/${appserver.dir.name}</appserver.home>
+      </properties>
+    </profile>
+
     <profile>
       <id>wildfly8</id>
       <activation>
+        <activeByDefault>true</activeByDefault>
         <property>
           <name>appserver</name>
           <value>wildfly8</value>
         </property>
       </activation>
       <properties>
+        <cargo.container>wildfly8x</cargo.container>
+        <!-- used in the wildfly8 profile in zanata-war -->
         <wildfly.version>8.1.0.Final</wildfly.version>
+        <!-- In case this profile was activated by default: -->
+        <appserver>wildfly8</appserver>
+        <cargo.installation>http://download.jboss.org/wildfly/${wildfly.version}/wildfly-${wildfly.version}.zip</cargo.installation>
+        <!-- name of the top-level dir within the appserver zip -->
+        <appserver.dir.name>wildfly-${wildfly.version}</appserver.dir.name>
+        <!-- where the appserver will be installed -->
+        <appserver.home>${cargo.extract.dir}/${appserver.dir.name}/${appserver.dir.name}</appserver.home>
+
+        <module.wildfly.version>8.1.0.Final</module.wildfly.version>
+        <mojarra.module.version>2.1.28</mojarra.module.version>
+        <mojarra.module.name>wildfly-${module.wildfly.version}-module-mojarra-${mojarra.module.version}.zip</mojarra.module.name>
+        <hibernate.module.version>4.2.15.Final</hibernate.module.version>
+        <hibernate.module.name>wildfly-${module.wildfly.version}-module-hibernate-main-${hibernate.module.version}.zip</hibernate.module.name>
+        <module.download.dir>${project.build.directory}/downloads</module.download.dir>
       </properties>
+
+      <build>
+        <plugins>
+          <!--
+          Download wildfly modules from sf.net and extract under appserver.home
+          -->
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>install-wildfly-modules</id>
+                <!-- submodules should use 'package' to activate this -->
+                <phase>none</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target unless="skipITs">
+                    <!-- TODO put these zips under ${user.home}/Downloads too -->
+                    <mkdir dir="${module.download.dir}" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
+                      dest="${module.download.dir}/${mojarra.module.name}"
+                      usetimestamp="true" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
+                      dest="${module.download.dir}/${hibernate.module.name}"
+                      usetimestamp="true" />
+                    <unzip
+                      src="${module.download.dir}/${mojarra.module.name}"
+                      dest="${appserver.home}" />
+                    <unzip
+                      src="${module.download.dir}/${hibernate.module.name}"
+                      dest="${appserver.home}" />
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+
       <!-- These override the older versions forced by jboss-as-parent 7.2.0 -->
       <dependencyManagement>
         <dependencies>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index db09a279d4..b63e3ce816 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -974,6 +974,81 @@
       </build>
     </profile>
 
+    <profile>
+      <id>skipArqTests</id>
+      <activation>
+        <property>
+          <name>skipArqTests</name>
+        </property>
+      </activation>
+      <properties>
+        <skipITs>true</skipITs>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>run-arq-tests</id>
+      <activation>
+        <property>
+          <name>!skipArqTests</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>init-no-appserver</id>
+                <phase>initialize</phase>
+              </execution>
+              <execution>
+                <id>preIT-no-appserver</id>
+                <phase>prepare-package</phase>
+                <goals><goal>run</goal></goals>
+                <configuration>
+                  <target unless="skipArqTests">
+                    <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)"
+                      unless="appserver" />
+                    <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipArqTests)"
+                      unless="cargo.installation"/>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.cargo</groupId>
+            <artifactId>cargo-maven2-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>cargo-install</id>
+                <phase>prepare-package</phase>
+              </execution>
+            </executions>
+          </plugin>
+
+          <plugin>
+            <artifactId>maven-failsafe-plugin</artifactId>
+            <configuration>
+              <includes>
+                <include>**/*ITCase.java</include>
+              </includes>
+              <forkCount>1</forkCount>
+              <reuseForks>true</reuseForks>
+              <redirectTestOutputToFile>false</redirectTestOutputToFile>
+              <runOrder>alphabetical</runOrder>
+              <systemPropertyVariables>
+                <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+                <jboss.home>${appserver.home}</jboss.home>
+              </systemPropertyVariables>
+              <testNGArtifactName>none:none</testNGArtifactName>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>jbosseap6</id>
       <activation>
@@ -987,19 +1062,18 @@
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
+              <!-- Install arquillian-customised version of standalone.xml -->
               <execution>
                 <id>prepare-arquillian-container</id>
-                <phase>pre-integration-test</phase>
+                <phase>package</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <target>
-                    <fail message="'arquillian.jboss.home' property must be set to run integration tests in this profile"
-                      unless="arquillian.jboss.home"/>
+                  <target unless="skipArqTests">
                     <copy overwrite="true"
                       file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml"
-                      tofile="${arquillian.jboss.home}/standalone/configuration/standalone-arquillian.xml" />
+                      tofile="${appserver.home}/standalone/configuration/standalone-arquillian.xml" />
                   </target>
                 </configuration>
               </execution>
@@ -1019,31 +1093,14 @@
             </configuration>
           </plugin>
 
-          <!-- Configure Failsafe to run in integration-test/verify phase -->
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <!-- Container (Arquillian tests) -->
-              <execution>
-                <id>container-tests</id>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-                <configuration>
-                  <includes>
-                    <include>**/*ITCase.java</include>
-                  </includes>
-                  <testNGArtifactName>none:none</testNGArtifactName>
-                  <runOrder>alphabetical</runOrder>
-                  <forkCount>1</forkCount>
-                  <reuseForks>true</reuseForks>
-                  <systemPropertyVariables>
-                    <arquillian.launch>jbossas-managed</arquillian.launch>
-                  </systemPropertyVariables>
-                </configuration>
-              </execution>
-            </executions>
+            <configuration>
+              <systemPropertyVariables>
+                <!-- NB this is a container qualifier in arquillian.xml -->
+                <arquillian.launch>jbossas-managed</arquillian.launch>
+              </systemPropertyVariables>
+            </configuration>
           </plugin>
 
         </plugins>
@@ -1100,36 +1157,10 @@
           <value>wildfly8</value>
         </property>
       </activation>
-      <properties>
-        <wildfly.home>${project.build.directory}/wildfly/wildfly-${wildfly.version}</wildfly.home>
-      </properties>
       <build>
         <plugins>
           <plugin>
-            <!-- NB: This plugin needs to be before antrun, because it
-                 creates the wildfly directory for the unzip tasks. -->
             <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.wildfly</groupId>
-                      <artifactId>wildfly-dist</artifactId>
-                      <version>${wildfly.version}</version>
-                      <type>zip</type>
-                      <overWrite>false</overWrite>
-                      <outputDirectory>${project.build.directory}/wildfly</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
             <configuration>
               <usedDependencies combine.children="append">
                 <!-- used for arquillian tests -->
@@ -1143,78 +1174,42 @@
           <plugin>
             <artifactId>maven-antrun-plugin</artifactId>
             <executions>
+              <execution>
+                <id>install-wildfly-modules</id>
+                <phase>package</phase>
+              </execution>
+
+              <!-- Install arquillian-customised version of standalone.xml -->
               <execution>
                 <id>prepare-arquillian-container</id>
-                <phase>pre-integration-test</phase>
+                <phase>package</phase>
                 <goals>
                   <goal>run</goal>
                 </goals>
                 <configuration>
-                  <target>
+                  <target unless="skipArqTests">
                     <copy
                       overwrite="true"
                       file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml"
-                      tofile="${wildfly.home}/standalone/configuration/standalone.xml" />
-                    <mkdir dir="${project.build.directory}/downloads/" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip/download"
-                      dest="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip"
-                      usetimestamp="true" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip/download"
-                      dest="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip"
-                      usetimestamp="true" />
-                    <unzip
-                      src="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-mojarra-2.1.28.zip"
-                      dest="${wildfly.home}" />
-                    <unzip
-                      src="${project.build.directory}/downloads/wildfly-8.1.0.Final-module-hibernate-main-4.2.15.Final.zip"
-                      dest="${wildfly.home}" />
+                      tofile="${appserver.home}/standalone/configuration/standalone.xml" />
                   </target>
                 </configuration>
               </execution>
             </executions>
           </plugin>
 
-          <!-- Configure Failsafe to run in integration-test/verify phase -->
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
-            <executions>
-              <!-- Container (Arquillian tests) -->
-              <execution>
-                <id>container-tests</id>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-                <configuration>
-                  <includes>
-                    <include>**/*ITCase.java</include>
-                  </includes>
-                  <testNGArtifactName>none:none</testNGArtifactName>
-                  <runOrder>alphabetical</runOrder>
-                  <forkCount>1</forkCount>
-                  <reuseForks>true</reuseForks>
-                  <systemPropertyVariables>
-                    <arquillian.launch>wildfly81</arquillian.launch>
-                    <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
-                    <!-- the maven dependency plugin will have already downloaded the server on /target -->
-                    <jboss.home>${wildfly.home}</jboss.home>
-                  </systemPropertyVariables>
-                  <redirectTestOutputToFile>false</redirectTestOutputToFile>
-                </configuration>
-              </execution>
-            </executions>
+            <configuration>
+              <systemPropertyVariables>
+                <!-- NB this is a container qualifier in arquillian.xml -->
+                <arquillian.launch>wildfly81</arquillian.launch>
+              </systemPropertyVariables>
+            </configuration>
           </plugin>
         </plugins>
       </build>
       <dependencies>
-        <dependency>
-          <groupId>io.undertow</groupId>
-          <artifactId>undertow-core</artifactId>
-          <version>1.0.15.Final</version>
-          <scope>provided</scope>
-        </dependency>
         <dependency>
           <groupId>org.wildfly</groupId>
           <artifactId>wildfly-arquillian-container-managed</artifactId>
diff --git a/zanata-war/src/test/resources/arquillian.xml b/zanata-war/src/test/resources/arquillian.xml
index 4c62e2a092..5823647c7f 100644
--- a/zanata-war/src/test/resources/arquillian.xml
+++ b/zanata-war/src/test/resources/arquillian.xml
@@ -12,7 +12,7 @@
   <container qualifier="jbossas-managed">
     <configuration>
       <!-- We can use the JBOSS_HOME env variable instead of this -->
-      <property name="jbossHome">${arquillian.jboss.home}</property>
+      <property name="jbossHome">${jboss.home}</property>
       <!-- We can use the JAVA_HOME env variable instead of this -->
       <!--             <property name="javaHome">/usr/lib/jvm/jre-1.6.0-openjdk.x86_64</property> -->
       <!--