diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 89cd929e6f..029677c3c3 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -27,8 +27,6 @@
     <cargo.container.home>${project.build.directory}/jboss/container</cargo.container.home>
     <context.path>zanata</context.path>
 
-    <!--data source-->
-    <ds.jndi.name>zanataDatasource</ds.jndi.name>
     <!--mysql-maven-plugin will use these setup-->
     <ds.database>root</ds.database>
     <ds.username>root</ds.username>
diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
index dfce763230..6c577ce453 100644
--- a/functional-test/src/test/resources/conf/standalone_wildfly.xml
+++ b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -268,7 +268,6 @@
       -->
       <cache-container name="zanata" default-cache="default"
         jndi-name="java:jboss/infinispan/container/zanata"
-        start="EAGER"
         module="org.jboss.as.clustering.web.infinispan">
         <local-cache name="default">
           <transaction mode="NON_XA" />
diff --git a/pom.xml b/pom.xml
index e913fde5b5..6a57384635 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1490,7 +1490,7 @@
         <wildfly.client.version>8.1.0.Final</wildfly.client.version>
         <!-- used in the wildfly8 profile in zanata-war -->
         <!-- This is the server version -->
-        <wildfly.version>9.0.0.Beta2</wildfly.version>
+        <wildfly.version>9.0.0.CR1</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>
diff --git a/zanata-war/src/etc/h2.properties b/zanata-war/src/etc/h2.properties
index f3d45e961e..372485096b 100644
--- a/zanata-war/src/etc/h2.properties
+++ b/zanata-war/src/etc/h2.properties
@@ -1,4 +1,3 @@
-ds.jndi.name=zanataTestDatasource
 ds.hibernate.dialect=org.hibernate.dialect.H2Dialect
 ds.driver.class=org.h2.Driver
 ds.connection.url=jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1
diff --git a/zanata-war/src/etc/mysql.properties b/zanata-war/src/etc/mysql.properties
index ae17fa49c6..11d9c3f580 100644
--- a/zanata-war/src/etc/mysql.properties
+++ b/zanata-war/src/etc/mysql.properties
@@ -1,4 +1,3 @@
-ds.jndi.name=zanataDatasource
 ds.driver.class=com.mysql.jdbc.Driver
 ds.connection.url=jdbc:mysql://localhost:3306/zanata?characterEncoding=UTF-8
 ds.user.name=sa
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
index 96ca32c277..4c71046a14 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
@@ -71,10 +71,9 @@
 
       entity-manager-factory name is also referenced in in persistence.xml
   -->
-  <!-- FIXME zanataDatabase vs testDatabase -->
   <persistence:entity-manager-factory
     name="entityManagerFactory"
-    persistence-unit-name="@persistence-unit-name@"
+    persistence-unit-name="zanataDatasourcePU"
     installed="true"
     startup="true" />
 
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
index 8257039542..b83a423c86 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
@@ -4,9 +4,9 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
   version="2.0">
 
-  <persistence-unit name="${ds.jndi.name}PU" transaction-type="JTA">
+  <persistence-unit name="zanataDatasourcePU" transaction-type="JTA">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
-    <jta-data-source>java:jboss/datasources/${ds.jndi.name}</jta-data-source>
+    <jta-data-source>java:jboss/datasources/zanataDatasource</jta-data-source>
     <mapping-file>META-INF/orm.xml</mapping-file>
 
     <class>org.zanata.model.Activity</class>
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
index fb38acf0e7..6d78e0480c 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
@@ -3,5 +3,4 @@
 
 env.debug=${env.debug}
 env.dbunit.type=${env.dbunit.type}
-persistence-unit-name=${ds.jndi.name}PU
 web.assets.version=${zanata.web.assets.version}
diff --git a/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml b/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
index f06149b53b..04e5f1a23f 100644
--- a/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
+++ b/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
@@ -92,7 +92,7 @@
 
   <context-param>
     <param-name>liquibase.datasource</param-name>
-    <param-value>java:jboss/datasources/${ds.jndi.name}</param-value>
+    <param-value>java:jboss/datasources/zanataDatasource</param-value>
   </context-param>
   <!--
   <context-param>
@@ -115,7 +115,7 @@
 
   <context-param>
     <param-name>javamelody.datasources</param-name>
-    <param-value>java:jboss/datasources/${ds.jndi.name}</param-value>
+    <param-value>java:jboss/datasources/zanataDatasource</param-value>
   </context-param>
 
   <!-- Zanata custom taglib -->
diff --git a/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy b/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
index a7d2c905c4..36a9751eb1 100644
--- a/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
+++ b/zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
@@ -28,7 +28,7 @@ import javax.persistence.Persistence
 @Listeners(TestMethodListener.class)
 abstract class ZanataGroovyJpaTest {
     private static final Logger log = LoggerFactory.getLogger(ZanataJpaTest.class);
-    private static final String PERSIST_NAME = "zanataTestDatasourcePU";
+    private static final String PERSIST_NAME = "zanataDatasourcePU";
 
     private static EntityManagerFactory emf;
 
diff --git a/zanata-war/src/test/java/org/zanata/ArquillianTest.java b/zanata-war/src/test/java/org/zanata/ArquillianTest.java
index 280e22a1e6..310df2a8b9 100644
--- a/zanata-war/src/test/java/org/zanata/ArquillianTest.java
+++ b/zanata-war/src/test/java/org/zanata/ArquillianTest.java
@@ -96,7 +96,7 @@ private static IDatabaseConnection getConnection() {
         try {
             DataSource dataSource =
                     (DataSource) Naming.getInitialContext().lookup(
-                            "java:jboss/datasources/zanataTestDatasource");
+                            "java:jboss/datasources/zanataDatasource");
             DatabaseConnection dbConn =
                     new DatabaseConnection(dataSource.getConnection());
             // NB: Specific to H2
diff --git a/zanata-war/src/test/java/org/zanata/RestTest.java b/zanata-war/src/test/java/org/zanata/RestTest.java
index d338056281..088fff9f08 100644
--- a/zanata-war/src/test/java/org/zanata/RestTest.java
+++ b/zanata-war/src/test/java/org/zanata/RestTest.java
@@ -160,7 +160,7 @@ private static IDatabaseConnection getConnection() {
         try {
             DataSource dataSource =
                     (DataSource) Naming.getInitialContext().lookup(
-                            "java:jboss/datasources/zanataTestDatasource");
+                            "java:jboss/datasources/zanataDatasource");
             DatabaseConnection dbConn =
                     new DatabaseConnection(dataSource.getConnection());
             // NB: Specific to H2
diff --git a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
index 24651bcc36..5d9ff5cc14 100644
--- a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
+++ b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
@@ -31,7 +31,7 @@
 @Test(singleThreaded = true)
 public abstract class ZanataJpaTest {
     private static final Logger log = LoggerFactory.getLogger(ZanataJpaTest.class);
-    private static final String PERSIST_NAME = "zanataTestDatasourcePU";
+    private static final String PERSIST_NAME = "zanataDatasourcePU";
 
     private static EntityManagerFactory emf;
 
diff --git a/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java b/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
index 8641d1549d..7570d86596 100644
--- a/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
+++ b/zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
@@ -101,6 +101,7 @@ public boolean include(ArchivePath object) {
                 "arquillian/components.properties"), "components.properties");
         archive.addAsResource("import.sql");
         archive.addAsResource("messages.properties");
+        archive.addAsWebInfResource(new File("src/main/webapp-jboss/WEB-INF/jboss-web.xml"));
         archive.addAsWebInfResource(new File(
                 "src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml"));
         archive.setWebXML("arquillian/test-web.xml");
diff --git a/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java b/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
index cc354751de..748b11ef45 100644
--- a/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
+++ b/zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
@@ -36,7 +36,7 @@
  */
 public class JPAProvider {
     private static final Logger log = LoggerFactory.getLogger(JPAProvider.class);
-    private static final String PERSIST_NAME = "zanataTestDatasourcePU";
+    private static final String PERSIST_NAME = "zanataDatasourcePU";
 
     private static EntityManagerFactory emf;
 
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
index ac3b832077..012fec001c 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
@@ -72,7 +72,7 @@
  */
 @Slf4j
 public class CopyTransServiceImplPerformanceTest {
-    private static final String PERSIST_NAME = "zanataTestDatasourcePU";
+    private static final String PERSIST_NAME = "zanataDatasourcePU";
     private static final String MYSQL_TEST_DB_URL =
             "jdbc:log4jdbc:mysql://localhost:3306/zanata_unit_test?characterEncoding=UTF-8";
     private static final String MYSQL_DIALECT =
diff --git a/zanata-war/src/test/resources/META-INF/persistence.xml b/zanata-war/src/test/resources/META-INF/persistence.xml
index 2e08a55921..9bc0422287 100755
--- a/zanata-war/src/test/resources/META-INF/persistence.xml
+++ b/zanata-war/src/test/resources/META-INF/persistence.xml
@@ -4,7 +4,7 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
   version="2.0">
 
-  <persistence-unit name="zanataTestDatasourcePU"
+  <persistence-unit name="zanataDatasourcePU"
     transaction-type="RESOURCE_LOCAL">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
 
diff --git a/zanata-war/src/test/resources/arquillian/components.properties b/zanata-war/src/test/resources/arquillian/components.properties
index fd9c351f61..97e9afe143 100644
--- a/zanata-war/src/test/resources/arquillian/components.properties
+++ b/zanata-war/src/test/resources/arquillian/components.properties
@@ -3,5 +3,4 @@
 
 env.debug=true
 env.dbunit.type=HSQL
-persistence-unit-name=zanataTestDatasourcePU
 web.assets.version=1
diff --git a/zanata-war/src/test/resources/arquillian/persistence.xml b/zanata-war/src/test/resources/arquillian/persistence.xml
index 59e1d25090..a593fa7624 100755
--- a/zanata-war/src/test/resources/arquillian/persistence.xml
+++ b/zanata-war/src/test/resources/arquillian/persistence.xml
@@ -4,11 +4,11 @@
   xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"
   version="2.0">
 
-  <persistence-unit name="zanataTestDatasourcePU"
+  <persistence-unit name="zanataDatasourcePU"
     transaction-type="JTA">
     <provider>org.hibernate.ejb.HibernatePersistence</provider>
 
-    <jta-data-source>java:jboss/datasources/zanataTestDatasource</jta-data-source>
+    <jta-data-source>java:jboss/datasources/zanataDatasource</jta-data-source>
 
     <!--
       NB non-jta-data-source is not compatible with JPA tests, but is
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
index c6e58628ee..53a4880331 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -153,8 +153,8 @@
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:datasources:2.0">
       <datasources>
-        <datasource jndi-name="java:jboss/datasources/zanataTestDatasource"
-          pool-name="zanataTestDatasourcePool" enabled="true"
+        <datasource jndi-name="java:jboss/datasources/zanataDatasource"
+          pool-name="zanataDatasource" enabled="true"
           use-ccm="true"
           use-java-context="true">
           <connection-url>jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1</connection-url>
@@ -280,7 +280,6 @@
       Zanata multi-purpose caches.
       -->
       <cache-container name="zanata" default-cache="default" jndi-name="java:jboss/infinispan/container/zanata"
-        start="EAGER"
         module="org.jboss.as.clustering.web.infinispan">
         <local-cache name="default">
           <transaction mode="NON_XA"/>
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
index 38c65840b3..2279302630 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
@@ -116,8 +116,8 @@
     <subsystem xmlns="urn:jboss:domain:configadmin:1.0" />
     <subsystem xmlns="urn:jboss:domain:datasources:1.1">
       <datasources>
-        <datasource jndi-name="java:jboss/datasources/zanataTestDatasource"
-          pool-name="zanataTestDatasourcePool" enabled="true"
+        <datasource jndi-name="java:jboss/datasources/zanataDatasource"
+          pool-name="zanataDatasource" enabled="true"
           use-ccm="true"
           use-java-context="true">
           <connection-url>jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1</connection-url>