diff --git a/zanata-war/src/test/java/org/zanata/RestTest.java b/zanata-war/src/test/java/org/zanata/RestTest.java
index f680f8714e..9e645d5bcd 100644
--- a/zanata-war/src/test/java/org/zanata/RestTest.java
+++ b/zanata-war/src/test/java/org/zanata/RestTest.java
@@ -32,10 +32,10 @@
 import org.dbunit.database.DatabaseConnection;
 import org.dbunit.database.IDatabaseConnection;
 import org.dbunit.ext.h2.H2DataTypeFactory;
+import org.infinispan.manager.CacheContainer;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.resteasy.client.ClientRequest;
-import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.seam.util.Naming;
 import org.junit.After;
 import org.junit.Before;
@@ -46,7 +46,7 @@
 import org.zanata.rest.ResourceRequestEnvironment;
 import org.zanata.rest.client.ZanataProxyFactory;
 import org.zanata.rest.dto.VersionInfo;
-import org.zanata.rest.helper.RemoteTestSignaler;
+import org.zanata.util.ServiceLocator;
 
 /**
  * Provides basic test utilities to test raw REST APIs and compatibility.
@@ -122,6 +122,9 @@ public void prepareDataBeforeTest() {
     @RemoteAfter
     public void cleanDataAfterTest() {
         dbUnitProvider.cleanDataAfterTest();
+        ServiceLocator.instance()
+                .getJndiComponent("java:jboss/infinispan/container/hibernate",
+                        CacheContainer.class).stop();
     }
 
     @Before
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 94fa0f18f2..7c5fc28b1c 100644
--- a/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
+++ b/zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
@@ -43,7 +43,6 @@ public InfinispanTestCacheContainer() {
 
     @Override
     public void start() {
-        stop();
         this.delegate =
                 new DefaultCacheManager(getDefaultGlobalConfiguration());
         this.delegate.start();
diff --git a/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java b/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
index 08aef7dc30..15da05c448 100644
--- a/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
+++ b/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
@@ -76,7 +76,7 @@ protected void prepareDBUnitOperations() {
                 DatabaseOperation.CLEAN_INSERT));
 
         addAfterTestOperation(new DataSetOperation(
-                "org/zanata/test/model/HistoryTestData.dbunit.xml",
+                "org/zanata/test/model/ClearAllTables.dbunit.xml",
                 DatabaseOperation.DELETE_ALL));
     }
 
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
index ac2fef3e67..edc77ce255 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
@@ -7,11 +7,11 @@
 
 import org.infinispan.manager.CacheContainer;
 import org.jboss.resteasy.client.ClientResponse;
-import org.jboss.seam.security.management.JpaIdentityStore;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.zanata.cache.InfinispanTestCacheContainer;
@@ -58,6 +58,11 @@ protected void prepareResources() {
         resources.add(translatedDocResourceService);
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     @Test(dataProvider = "ResourceTestData")
     public void testPutGetResourceWithExtension(Resource sr) {
         log.debug("put resource:" + sr.toString());
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
index 4569b7b92c..5b75daa4aa 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
@@ -19,6 +19,7 @@
 import org.mockito.MockitoAnnotations;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -176,6 +177,11 @@ public void createClient() {
                         createBaseURI(RESOURCE_PATH));
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     @Test
     public void fetchEmptyListOfResources() {
         doGetandAssertThatResourceListContainsNItems(0);
diff --git a/zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
index 976e9ee714..ea154cb19b 100644
--- a/zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
+++ b/zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
@@ -10,6 +10,7 @@
 import org.mockito.MockitoAnnotations;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.zanata.cache.InfinispanTestCacheContainer;
@@ -77,6 +78,11 @@ protected void prepareResources() {
         resources.add(translatedDocResourceService);
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     @Test
     public void testDeleteTranslation() {
         Resource res = resourceTestFactory.getTextFlowTest();
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
index 54cd60913d..9baf61e777 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
@@ -120,6 +120,11 @@ protected void beforeMethod() throws Exception {
         AutowireTransaction.instance().rollback();
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     /**
      * Use this test to individually test copy trans scenarios.
      */
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
index 37a5752049..ef64868105 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
@@ -35,6 +35,7 @@
 import org.mockito.Matchers;
 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.ZanataDbunitJpaTest;
@@ -136,6 +137,11 @@ protected void beforeMethod() throws Exception {
                 .autowire(CopyVersionServiceImpl.class);
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     @Test
     public void testCopyVersionNotExist() {
         String projectSlug = "non-exists-project";
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
index e54800d599..828c1cf899 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
@@ -81,6 +81,11 @@ public void beforeMethod() {
         tsCache.create();
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     public void testGetLastModifiedTextFlowTarget() throws Exception {
         // Given:
         Long documentId = new Long("100");
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java b/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
index 5677efe8eb..e777300fe0 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
@@ -31,6 +31,7 @@
 import org.dbunit.operation.DatabaseOperation;
 import org.hamcrest.Matchers;
 import org.infinispan.manager.CacheContainer;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 import org.zanata.ZanataDbunitJpaTest;
@@ -96,6 +97,11 @@ public void initializeSeam() {
         versionGroupServiceImpl = seam.autowire(VersionGroupServiceImpl.class);
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     @Test
     public void getLocaleStatisticTest1() {
         LocaleId localeId = LocaleId.DE;
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 6d4f8df3fa..db17961a7f 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
@@ -42,7 +42,7 @@ public void beforeMethod() {
 
     @AfterMethod
     public void afterMethod() {
-        cache.destroy();
+        cacheContainer.stop();
     }
 
     public void getStatisticTest() throws Exception {
diff --git a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
index 19ad38dca1..7bae17b8a6 100644
--- a/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
+++ b/zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
@@ -17,6 +17,7 @@
 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.ZanataDbunitJpaTest;
@@ -101,13 +102,16 @@ public void setUp() throws Exception {
                         .useImpl(TextFlowSearchServiceImpl.class)
                         .useImpl(ValidationServiceImpl.class).allowCycles();
 
-        // @formatter:off
-      handler = seam.autowire(GetTransUnitListHandler.class);
-      // @formatter:on
+        handler = seam.autowire(GetTransUnitListHandler.class);
 
         jaHLocale = getEm().find(HLocale.class, 3L);
     }
 
+    @AfterMethod
+    protected void cleanup() {
+        cacheContainer.stop();
+    }
+
     private void prepareActionAndMockLocaleService(GetTransUnitList action) {
         action.setEditorClientId(new EditorClientId("sessionId", 1));
         action.setWorkspaceId(TestFixture.workspaceId(localeId, "plurals",
diff --git a/zanata-war/src/test/resources/arquillian/persistence.xml b/zanata-war/src/test/resources/arquillian/persistence.xml
index 86481e7d53..c966cfea17 100755
--- a/zanata-war/src/test/resources/arquillian/persistence.xml
+++ b/zanata-war/src/test/resources/arquillian/persistence.xml
@@ -67,7 +67,9 @@
     <properties>
       <property name="hibernate.show_sql" value="false" />
       <property name="hibernate.cache.region.factory_class"
-        value="org.hibernate.testing.cache.CachingRegionFactory" />
+        value="org.hibernate.cache.infinispan.JndiInfinispanRegionFactory" />
+      <property name="hibernate.cache.infinispan.cachemanager" value="java:jboss/infinispan/container/hibernate" />
+      <property name="hibernate.cache.region_prefix" value="" />
       <property name="hibernate.hbm2ddl.auto" value="create-drop" />
 
       <property name="hibernate.connection.provider_class"
diff --git a/zanata-war/src/test/resources/arquillian/standalone.xml b/zanata-war/src/test/resources/arquillian/standalone.xml
index 749e830b98..3ff295d20e 100644
--- a/zanata-war/src/test/resources/arquillian/standalone.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone.xml
@@ -174,7 +174,10 @@
       </thread-pools>
     </subsystem>
     <subsystem xmlns="urn:jboss:domain:infinispan:1.3">
+      <!-- Hibernate Cache settings -->
       <cache-container name="hibernate" default-cache="local-query"
+        start="EAGER"
+        jndi-name="java:jboss/infinispan/container/hibernate"
         module="org.jboss.as.jpa.hibernate:4">
         <local-cache name="entity">
           <transaction mode="NON_XA" />
@@ -193,9 +196,11 @@
       </cache-container>
       <!--
       Hibernate search infinispan settings
-      - Default In-memory 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">
+      <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"/>