diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index d939121cb2..7d139a6dd6 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -337,7 +337,7 @@
         <standalone.xml.file>standalone_wildfly.xml</standalone.xml.file>
         <jndi-remote-client.groupId>org.wildfly</jndi-remote-client.groupId>
         <jndi-remote-client.artifactId>wildfly-ejb-client-bom</jndi-remote-client.artifactId>
-        <jndi-remote-client.version>${wildfly.version}</jndi-remote-client.version>
+        <jndi-remote-client.version>${wildfly.client.version}</jndi-remote-client.version>
       </properties>
       <build>
         <plugins>
diff --git a/pom.xml b/pom.xml
index 78da23d3ff..7192420829 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1203,7 +1203,9 @@
       </activation>
       <properties>
         <cargo.container>wildfly8x</cargo.container>
+        <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>8.1.0.Final</wildfly.version>
         <!-- In case this profile was activated by default: -->
         <appserver>wildfly8</appserver>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 9f637244f9..048dc7a8d3 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -1207,7 +1207,7 @@
         <dependency>
           <groupId>org.wildfly</groupId>
           <artifactId>wildfly-arquillian-container-managed</artifactId>
-          <version>${wildfly.version}</version>
+          <version>${wildfly.client.version}</version>
           <scope>test</scope>
           <exclusions>
             <exclusion>