diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
index a64ac1f4c3..972260a725 100644
--- a/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
+++ b/zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
@@ -60,7 +60,6 @@ public class VersionStateCacheImpl implements VersionStateCache {
     private CacheWrapper<VersionLocaleKey, WordStatistic> versionStatisticCache;
     private CacheLoader<VersionLocaleKey, WordStatistic> versionStatisticLoader;
 
-    @In
     private CacheContainer cacheContainer;
 
     @In
@@ -127,6 +126,11 @@ public void clearVersionStatsCache(Long versionId) {
         }
     }
 
+    @In
+    public void setCacheContainer(CacheContainer cacheContainer) {
+        this.cacheContainer = cacheContainer;
+    }
+
     private static class VersionStatisticLoader extends
             CacheLoader<VersionLocaleKey, WordStatistic> {
 
diff --git a/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java b/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
index 68ea4e1f2a..475bd11625 100644
--- a/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
+++ b/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
@@ -42,6 +42,7 @@ public InfinispanTestCacheContainer() {
     public void start() {
         stop();
         this.delegate = new DefaultCacheManager();
+        configure();
         this.delegate.start();
     }
 
@@ -51,4 +52,13 @@ public void stop() {
             delegate.stop();
         }
     }
+
+    private void configure() {
+        /* This allows multiple concurrent tests to run.
+           See https://issues.jboss.org/browse/ISPN-2886 for the exception that
+           is thrown when this is not used.
+         */
+        this.delegate.getCacheManagerConfiguration().globalJmxStatistics()
+                .allowDuplicateDomains();
+    }
 }
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
index bde0d9c56c..6d4f8df3fa 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
@@ -5,11 +5,13 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import org.infinispan.manager.CacheContainer;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
+import org.zanata.cache.InfinispanTestCacheContainer;
 import org.zanata.common.LocaleId;
 import org.zanata.service.VersionLocaleKey;
 import org.zanata.ui.model.statistic.WordStatistic;
@@ -26,14 +28,15 @@ public class VersionStateCacheImplTest {
 
     @Mock
     private CacheLoader<VersionLocaleKey, WordStatistic> versionStatisticLoader;
+    private final CacheContainer cacheContainer =
+            new InfinispanTestCacheContainer();
 
     @BeforeMethod
     public void beforeMethod() {
         MockitoAnnotations.initMocks(this);
         cache = new VersionStateCacheImpl(versionStatisticLoader);
-
-        cache.create();
-        cache.destroy();
+        cacheContainer.start();
+        cache.setCacheContainer(cacheContainer);
         cache.create();
     }
 
diff --git a/zanata-war/src/test/resources/arquillian/persistence.xml b/zanata-war/src/test/resources/arquillian/persistence.xml
index f5743cf7cb..86481e7d53 100755
--- a/zanata-war/src/test/resources/arquillian/persistence.xml
+++ b/zanata-war/src/test/resources/arquillian/persistence.xml
@@ -83,9 +83,10 @@
 
       <!-- Search engine -->
       <property name="hibernate.search.default.directory_provider"
-        value="org.hibernate.search.store.impl.FSDirectoryProvider" />
-      <property name="hibernate.search.default.indexBase"
-        value="zanatasearchindex" />
+        value="infinispan" />
+      <!-- to use an existing cache manager (Good for external configuration) -->
+      <property name="hibernate.search.infinispan.cachemanager_jndiname"
+        value="java:jboss/infinispan/container/hibernate-search"/>
       <property name="hibernate.search.lucene_version" value="LUCENE_36" />
       <property name="hibernate.search.worker.batch_size" value="50" />
 
diff --git a/zanata-war/src/test/resources/arquillian/standalone.xml b/zanata-war/src/test/resources/arquillian/standalone.xml
index fe9c451cf6..749e830b98 100644
--- a/zanata-war/src/test/resources/arquillian/standalone.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone.xml
@@ -191,6 +191,27 @@
           <eviction strategy="NONE" />
         </local-cache>
       </cache-container>
+      <!--
+      Hibernate search infinispan settings
+      - Default In-memory settings
+      -->
+      <cache-container name="hibernate-search" default-cache="indexes" jndi-name="java:jboss/infinispan/container/hibernate-search" start="EAGER" module="org.jboss.as.clustering.web.infinispan">
+        <local-cache name="LuceneIndexesMetadata" start="EAGER" batching="false"/>
+        <local-cache name="LuceneIndexesData" start="EAGER" batching="false"/>
+        <local-cache name="LuceneIndexesLocking" start="EAGER" batching="false"/>
+      </cache-container>
+      <!--
+      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"/>
+          <eviction strategy="LRU" max-entries="10000"/>
+          <expiration max-idle="100000"/>
+        </local-cache>
+      </cache-container>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:jaxrs:1.0" />
     <subsystem xmlns="urn:jboss:domain:jca:1.1">