diff --git a/functional-test/src/test/resources/conf/standalone.xml b/functional-test/src/test/resources/conf/standalone.xml
index aaccd519ea..b5d4f0307b 100644
--- a/functional-test/src/test/resources/conf/standalone.xml
+++ b/functional-test/src/test/resources/conf/standalone.xml
@@ -28,6 +28,7 @@
   </extensions>
   <system-properties>
     <property name="zanata.countAjax" value="true" />
+    <property name="jboss.as.management.blocking.timeout" value="1000"/>
   </system-properties>
   <management>
     <security-realms>
diff --git a/functional-test/src/test/resources/conf/standalone_wildfly.xml b/functional-test/src/test/resources/conf/standalone_wildfly.xml
index 8a732e530b..990c51d03c 100644
--- a/functional-test/src/test/resources/conf/standalone_wildfly.xml
+++ b/functional-test/src/test/resources/conf/standalone_wildfly.xml
@@ -28,6 +28,7 @@
   </extensions>
   <system-properties>
     <property name="zanata.countAjax" value="true" />
+    <property name="jboss.as.management.blocking.timeout" value="1000"/>
   </system-properties>
   <management>
     <security-realms>
diff --git a/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
index ee7c3d676c..de54ef511d 100644
--- a/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
+++ b/zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
@@ -31,6 +31,7 @@
     <system-properties>
         <property name="javamelody.storage-directory" value="${user.home}/zanata/stats"/>
         <property name="hibernate.search.default.indexBase" value="${user.home}/zanata/indexes"/>
+        <property name="jboss.as.management.blocking.timeout" value="1000"/>
     </system-properties>
 
 
diff --git a/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml b/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
index a4edfd67c3..e81340b76b 100644
--- a/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
+++ b/zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
@@ -32,6 +32,7 @@
         <property name="javamelody.storage-directory" value="${user.home}/zanata/stats"/>
         <property name="hibernate.search.default.indexBase" value="${user.home}/zanata/indexes"/>
         <property name="ehcache.disk.store.dir" value="${user.home}/zanata/ehcache"/>
+        <property name="jboss.as.management.blocking.timeout" value="1000"/>
     </system-properties>
 
 
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 c1837c4fd8..20e80f1089 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
@@ -29,6 +29,7 @@
   <system-properties>
     <property name="hibernate.search.default.indexBase"
       value="./target/zanatasearchindex" />
+    <property name="jboss.as.management.blocking.timeout" value="1000"/>
     <!--javamelody.storage-directory=/var/lib/zanata/stats-->
   </system-properties>
   <management>
diff --git a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
index e89da36638..602617e2b2 100644
--- a/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
+++ b/zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
@@ -31,6 +31,7 @@
   <system-properties>
     <property name="hibernate.search.default.indexBase"
       value="./target/zanatasearchindex" />
+    <property name="jboss.as.management.blocking.timeout" value="1000"/>
     <!--javamelody.storage-directory=/var/lib/zanata/stats-->
   </system-properties>