diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 2759eaccd1..8ba89dce9b 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -36,6 +36,7 @@
     <ds.jndi.name>zanataDatasource</ds.jndi.name>
     <!--<ds.hibernate.dialect>org.hibernate.dialect.H2Dialect</ds.hibernate.dialect>-->
     <ds.driver.class>org.h2.Driver</ds.driver.class>
+    <!--<ds.connection.url>jdbc:h2:file:${project.build.directory}/h2/zanata;AUTO_SERVER=TRUE;</ds.connection.url>-->
     <ds.connection.url>jdbc:h2:file:${project.build.directory}/h2/zanata;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE</ds.connection.url>
     <ds.username>sa</ds.username>
     <ds.password />
@@ -63,7 +64,7 @@
     </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>
-    <document.storage.directory>${project.build.directory}/zanata-documents</document.storage.directory>
+    <hibernate.search.default.indexBase>${project.build.directory}/zanataindex</hibernate.search.default.indexBase>
   </properties>
 
   <dependencies>
@@ -345,6 +346,14 @@
       <scope>test</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.jboss.as</groupId>
+      <artifactId>jboss-as-ejb-client-bom</artifactId>
+      <version>7.1.1.Final</version>
+      <type>pom</type>
+      <scope>test</scope>
+    </dependency>
+
   </dependencies>
 
   <profiles>
@@ -385,7 +394,7 @@
                 <systemProperties>
                   <ehcache.disk.store.dir>${project.build.directory}/ehcache</ehcache.disk.store.dir>
                   <jboss.server.log.threshold>WARN</jboss.server.log.threshold>
-                  <hibernate.search.default.indexBase>${project.build.directory}/zanataindex</hibernate.search.default.indexBase>
+                  <hibernate.search.default.indexBase>${hibernate.search.default.indexBase}</hibernate.search.default.indexBase>
                 </systemProperties>
               </container>
 
diff --git a/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java b/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
index 6622b8f052..ec8f115b25 100644
--- a/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
+++ b/functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
@@ -62,7 +62,7 @@ public class UploadTest {
     public void before() {
         new BasicWorkFlow().goToHome().deleteCookiesAndRefresh();
         documentStorageDirectory =
-                PropertiesHolder.getProperty("document.storage.directory")
+                CleanDocumentStorageRule.getDocumentStoragePath()
                         .concat(File.separator).concat("documents")
                         .concat(File.separator);
         assumeFalse("", new File(documentStorageDirectory).exists());
diff --git a/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java b/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
index ef4804f87a..d53f0c12d4 100644
--- a/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
+++ b/functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
@@ -1,11 +1,16 @@
 package org.zanata.util;
 
+import com.google.common.base.Throwables;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.junit.rules.ExternalResource;
 
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import java.io.File;
 import java.io.IOException;
+import java.util.Properties;
 
 /**
  * @author Patrick Huang <a
@@ -14,11 +19,13 @@
 @Slf4j
 public class CleanDocumentStorageRule extends ExternalResource {
 
+    private static String storagePath;
+
     public static void resetFileData() {
-        File path =
-                new File(
-                        PropertiesHolder
-                                .getProperty("document.storage.directory"));
+        String documentStoragePath = getDocumentStoragePath();
+        log.debug("document storage path: {}", documentStoragePath);
+        
+        File path = new File(documentStoragePath);
         if (path.exists()) {
             try {
                 FileUtils.deleteDirectory(path);
@@ -29,6 +36,27 @@ public static void resetFileData() {
         }
     }
 
+    public static String getDocumentStoragePath() {
+        if (storagePath == null) {
+            final Properties env = new Properties();
+            env.put(Context.INITIAL_CONTEXT_FACTORY,
+                    org.jboss.naming.remote.client.InitialContextFactory.class
+                            .getName());
+            env.put(Context.PROVIDER_URL, "remote://localhost:4447");
+            InitialContext remoteContext = null;
+            try {
+                remoteContext = new InitialContext(env);
+                storagePath =
+                    (String) remoteContext
+                        .lookup("zanata/files/document-storage-directory");
+            }
+            catch (NamingException e) {
+                throw Throwables.propagate(e);
+            }
+        }
+        return storagePath;
+    }
+
     @Override
     protected void before() throws Throwable {
         super.before();
@@ -40,4 +68,6 @@ protected void after() {
         super.after();
         resetFileData();
     }
+
+
 }
diff --git a/functional-test/src/test/resources/META-INF/persistence.xml b/functional-test/src/test/resources/META-INF/persistence.xml
index c757f3d3f5..4bdc23f79f 100755
--- a/functional-test/src/test/resources/META-INF/persistence.xml
+++ b/functional-test/src/test/resources/META-INF/persistence.xml
@@ -83,7 +83,7 @@
       <property name="hibernate.search.default.directory_provider"
         value="org.hibernate.search.store.impl.FSDirectoryProvider" />
       <property name="hibernate.search.default.indexBase"
-        value="/tmp/zanatasearchindex" />
+        value="${hibernate.search.default.indexBase}" />
       <property name="hibernate.search.lucene_version" value="LUCENE_35" />
       <property name="hibernate.search.worker.batch_size" value="50" />
 
diff --git a/functional-test/src/test/resources/conf/standalone.xml b/functional-test/src/test/resources/conf/standalone.xml
index 00a9c995ac..6c85c3ecc3 100644
--- a/functional-test/src/test/resources/conf/standalone.xml
+++ b/functional-test/src/test/resources/conf/standalone.xml
@@ -244,6 +244,8 @@
           value="no-reply@zanata.org" />
         <simple name="java:global/zanata/files/document-storage-directory"
           value="${project.build.directory}/zanata-documents" />
+        <lookup name="java:jboss/exported/zanata/files/document-storage-directory"
+          lookup="java:global/zanata/files/document-storage-directory" />
       </bindings>
       <remote-naming />
     </subsystem>
diff --git a/functional-test/src/test/resources/setup.properties b/functional-test/src/test/resources/setup.properties
index 93d84c9714..cdf6014467 100644
--- a/functional-test/src/test/resources/setup.properties
+++ b/functional-test/src/test/resources/setup.properties
@@ -10,5 +10,3 @@ webdriver.display=${webdriver.display}
 zanata.instance.url=${zanata.instance.url}
 zanata.sample.projects.basedir=${zanata.sample.projects.basedir}
 zanata.apikey=${zanata.apikey}
-
-document.storage.directory=${document.storage.directory}