diff --git a/enterprise-update-test/pom.xml b/enterprise-update-test/pom.xml
index 278d469fe8..0da3087454 100644
--- a/enterprise-update-test/pom.xml
+++ b/enterprise-update-test/pom.xml
@@ -10,15 +10,27 @@
     <packaging>pom</packaging>
 
   <properties>
-  
-    <!--  Two installers The base installer and this installer -->
-    <!--Todo calculate this -->
+
+    <!-- This test requires two installers, the base installer e.g. 5.1.0 
+      and this version's installer e.g. 5.1.0.4-SNAPSHOT -->
+    <!--Jean-Pierre will rework this for us -->
     <!--Todo this should be 5.1.0 but that does not exist yet -->
     <update.base.version>5.1.0</update.base.version>
-    
-    <!-- https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/ -->
-    
-    <unpacked.update.package>${project.build.directory}/dependency/alfresco-enterprise-update-package-${project.version}</unpacked.update.package>   
+    <base.alfresco.installer.url>https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/alfresco-one-installer-20160203-SNAPSHOT-664-linux-x64.bin</base.alfresco.installer.url>
+    <this.alfresco.installer.url>https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/alfresco-one-installer-20160203-SNAPSHOT-664-linux-x64.bin</this.alfresco.installer.url>
+
+    <!-- Where to put the two deployed instances of alfresco -->
+    <base.alfresco.instance>${project.build.directory}/test-data/base-alf-installation</base.alfresco.instance>
+    <update.alfresco.instance>${project.build.directory}/test-data/update-alf-installation</update.alfresco.instance>
+
+    <!-- Arguments to install alfresco -->
+    <installer.args>--mode unattended --alfresco_admin_password admin --jdbc_username alfresco --jdbc_password alfresco
+      --tomcat_server_domain ${HOSTNAME}
+      --enable-components javaalfresco,postgres,libreofficecomponent,alfrescosolr,alfrescosolr4,aosmodule,alfrescowcmqs,alfrescogoogledocs
+      --alfrescocustomstack_services_startup demand
+    </installer.args>
+
+    <unpacked.update.package>${project.build.directory}/dependency/alfresco-enterprise-update-package-${project.version}</unpacked.update.package>
   </properties>
 
   <dependencies>
@@ -62,7 +74,8 @@
         </executions>
       </plugin>
 
-      <!-- Download and install the latest enterprise alfresco installer from bamboo -->
+      <!-- Download and install the latest enterprise alfresco installer 
+        from bamboo -->
       <plugin>
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
@@ -76,6 +89,15 @@
               <target>
                 <taskdef resource="net/sf/antcontrib/antlib.xml" />
 
+                <condition property="isWindows" value="true">
+                  <os family="windows" />
+                </condition>
+
+                <condition property="isLinux" value="true">
+                  <os family="unix" />
+                </condition>
+
+                <!-- Download and install the base version of alfresco -->
                 <if>
                   <not>
                     <isset property="base.installer.location" />
@@ -85,17 +107,46 @@
                       location="${basedir}/target/base-alf-installer.bin" />
                     <echo>Downloading Base Alfresco installer to
                       ${base.installer.location}...</echo>
-                    <get src="https://nightlybuilds.alfresco.com/Enterprise-5.1/5.1/LATEST/ALL/alfresco-one-installer-20160203-SNAPSHOT-664-linux-x64.bin" 
-                        dest="${base.installer.location}"/>
+                    <!-- TODO Jean-Pierre will rewrite this for us -->
+                    <get src="${base.alfresco.installer.url}" dest="${base.installer.location}" />
+
+                    <chmod file="${base.installer.location}" perm="a+x"
+                      verbose="true" />
                   </then>
                 </if>
-                <chmod file="${base.installer.location}" perm="a+x"
-                  verbose="true" />
-                <echo>Installing The Base Versoion of Alfresco...</echo>
+                
+                <!-- Download and install this version of alfresco -->
+                <if>
+                  <not>
+                    <isset property="this.installer.location" />
+                  </not>
+                  <then>
+                    <property name="this.installer.location"
+                      location="${basedir}/target/this-alf-installer.bin" />
+                    <echo>Downloading This Alfresco installer to
+                      ${this.installer.location}...</echo>
+                    <!-- TODO Jean-Pierre will rewrite this for us -->
+                    <get src="${this.alfresco.installer.url}" dest="${this.installer.location}" />
+
+                    <chmod file="${this.installer.location}" perm="a+x"
+                      verbose="true" />
+                  </then>
+                </if>
+
+                <echo>Installing The base Version of Alfresco... to
+                  ${base.alfresco.instance}</echo>
                 <exec executable="${base.installer.location}" dir="target"
                   failonerror="true">
                   <arg
-                    line="--mode unattended --alfresco_admin_password admin --disable-components postgres,alfrescowcmqs --jdbc_username alfresco --jdbc_password alfresco --prefix ${basedir}/target/base-alf-installation --tomcat_server_domain ${HOSTNAME}" />
+                    line="${installer.args} --prefix ${base.alfresco.instance} " />
+                </exec>
+
+                <echo>Installing This Version of Alfresco... to
+                  ${update.alfresco.instance}</echo>
+                <exec
+                  executable="${this.installer.location}" dir="target" 
+                  failonerror="true">
+                  <arg line="${installer.args} --prefix ${update.alfresco.instance} " />
                 </exec>
               </target>
             </configuration>