diff --git a/archetypes/alfresco-allinone-archetype/pom.xml b/archetypes/alfresco-allinone-archetype/pom.xml
index f12b16fe..fb77c978 100644
--- a/archetypes/alfresco-allinone-archetype/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/pom.xml
@@ -22,6 +22,7 @@
             <includes>
                 <include>archetype-resources/pom.xml</include>
                 <include>archetype-resources/run.sh</include>
+                <include>archetype-resources/run.bat</include>
                 <include>archetype-resources/runner/src/main/webapp/index.html</include>
                 <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
@@ -32,6 +33,7 @@
             <excludes>
                 <exclude>archetype-resources/pom.xml</exclude>
                 <exclude>archetype-resources/run.sh</exclude>
+                <exclude>archetype-resources/run.bat</exclude>
                 <exclude>archetype-resources/runner/src/main/webapp/index.html</exclude>
                 <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 46834133..e27d572d 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -128,6 +128,12 @@
                         <include>**</include>
                     </includes>
                 </fileSet>
+                <fileSet encoding="UTF-8" filtered="false">
+                    <directory>test-ng</directory>
+                    <includes>
+                        <include>**</include>
+                    </includes>
+                </fileSet>
                 <fileSet encoding="UTF-8" filtered="false">
                     <directory>src/main/webapp</directory>
                     <includes>
@@ -143,6 +149,7 @@
             <directory></directory>
             <includes>
                 <include>run.sh</include>
+                <include>run.bat</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
index 66a0d6e1..7307fe16 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/pom.xml
@@ -39,10 +39,6 @@
 
         <!-- The Alfresco Share web application is accessible via this URL -->
         <share.client.url>http://localhost:8080/share</share.client.url>
-
-        <!-- For the Regression tests and Functional tests
-             we are using the following Share Page Objects (PO) release -->
-        <share.po.version>5.1-SNAPSHOT</share.po.version>
     </properties>
 
     <!-- Here we realize the connection with the Alfresco selected platform (e.g.version and edition) -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
index 31d8924d..198e99f3 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/run.bat
@@ -3,7 +3,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @echo off
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.3.RELEASE\springloaded-1.2.3.RELEASE.jar
+set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
 
 if not exist %springloadedfile% (
   mvn validate -Psetup
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
index dd4ce5ae..3ab7b89f 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml
@@ -153,7 +153,7 @@
                                     <goal>unpack</goal>
                                 </goals>
                                 <configuration>
-                                    <artifact>${alfresco.groupId}:share-po:${share.po.version}:jar:tests</artifact>
+                                    <artifact>${alfresco.groupId}:share-po:${alfresco.version}:jar:tests</artifact>
                                     <outputDirectory>${project.build.directory}/testng-resources</outputDirectory>
                                 </configuration>
                             </execution>
@@ -167,10 +167,9 @@
                         <configuration>
                             <suiteXmlFiles>
                                 <!-- Smaller test suite for Share, essential stuff like Login, Navigation, DocLib, and Search -->
-                                <suiteXmlFile>${project.build.directory}/testng-resources/testng-alfresco-share.xml</suiteXmlFile>
-
-                                <!-- Everthing takes a long time, hours-->
-                                <!--<suiteXmlFile>${project.build.directory}/testng-resources/testng.xml</suiteXmlFile> -->
+                                <!-- Currently using our own config to be able to comment out one test class
+                                    <suiteXmlFile>${project.build.directory}/testng-resources/testng-alfresco-share.xml</suiteXmlFile> -->
+                                <suiteXmlFile>${project.basedir}/test-ng/testng-alfresco-share.xml</suiteXmlFile>
                             </suiteXmlFiles>
                             <testClassesDirectory>${project.build.directory}/testng-resources</testClassesDirectory>
                             <systemPropertyVariables>
@@ -210,17 +209,61 @@
                 <dependency>
                     <groupId>${alfresco.groupId}</groupId>
                     <artifactId>share-po</artifactId>
-                    <version>${share.po.version}</version>
+                    <version>${alfresco.version}</version>
                     <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
                 <!-- Bring in the Share Page Object (PO) regression tests that comes with Alfresco.
                      These tests cover the Alfresco Share Web Application -->
                 <dependency>
                     <groupId>${alfresco.groupId}</groupId>
                     <artifactId>share-po</artifactId>
-                    <version>${share.po.version}</version>
+                    <version>${alfresco.version}</version>
                     <classifier>tests</classifier>
                     <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                    <version>2.45.0-alfresco</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                    <version>2.45.0-alfresco</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>servlet-api-2.5</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
 
                 <!-- Test NG is defined with test scope in share-po, so need it here too -->
@@ -297,8 +340,21 @@
                 <dependency>
                     <groupId>${alfresco.groupId}</groupId>
                     <artifactId>share-po</artifactId>
-                    <version>${share.po.version}</version>
+                    <version>${alfresco.version}</version>
                     <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
 
                 <!-- Bring in the Share Page Object (PO) Tests that comes with Alfresco. It has
@@ -307,9 +363,40 @@
                 <dependency>
                     <groupId>${alfresco.groupId}</groupId>
                     <artifactId>share-po</artifactId>
-                    <version>${share.po.version}</version>
+                    <version>${alfresco.version}</version>
                     <classifier>tests</classifier>
                     <scope>test</scope>
+
+                    <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+                       version 2.45 later on here in this profile -->
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-java</artifactId>
+                        </exclusion>
+                        <exclusion>
+                            <groupId>org.seleniumhq.selenium</groupId>
+                            <artifactId>selenium-server</artifactId>
+                        </exclusion>
+                    </exclusions>
+                </dependency>
+
+                <!-- Make sure we are running with newer selenium that works with newest FF (newer than 2.39.0) -->
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                    <version>2.45.0-alfresco</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                    <version>2.45.0-alfresco</version>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>org.mortbay.jetty</groupId>
+                            <artifactId>servlet-api-2.5</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
 
                 <!-- Test NG is defined with test scope in share-po, so need it here too -->
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml
new file mode 100644
index 00000000..bf3a1b02
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/test-ng/testng-alfresco-share.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0"?>
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
+<suite thread-count="1" parallel="tests" preserve-order="true" verbose="6" name="Alfresco Share UI Basic Regression Test">
+    <groups>
+        <run>
+            <include name="unit"/>
+            <include name="alfresco-one"/>
+            <exclude name=".*Bug42"/>
+            <exclude name=".*Bug"/>
+            <exclude name="chromeOnly"/>
+            <exclude name="Hybrid"/>
+            <exclude name="download"/>
+            <exclude name="communityIssue"/>
+        </run>
+    </groups>
+    <test name="LoginPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.LoginPageTest" />
+        </classes>
+    </test>
+    <test name="NavigationBarTest">
+        <classes>
+            <class name="org.alfresco.po.share.NavigationBarTest" />
+        </classes>
+    </test>
+    <test name="LiveSearchDropdownTest">
+        <classes>
+            <class name="org.alfresco.po.share.search.LiveSearchDropdownTest" />
+        </classes>
+    </test>
+    <test name="FacetedSearchResultsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.search.FacetedSearchResultsPageTest" />
+        </classes>
+    </test>
+    <test name="DocumentDetailsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.DocumentDetailsPageTest"/>
+        </classes>
+    </test>
+    <!-- TODO: fix this, currently does not work
+    <test name="DocumentLibraryPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.DocumentLibraryPageTest"/>
+        </classes>
+    </test>
+    -->
+    <test name="FileDirectoryInfoTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.FileDirectoryInfoTest">
+                <methods>
+                    <!-- these currently take longer than 60 seconds for page rendering... -->
+                    <exclude name="test107TagsForFolder" />
+                    <exclude name="test114TagsForFile" />
+                </methods>
+            </class>
+        </classes>
+    </test>
+    <test name="FolderDetailsPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.FolderDetailsPageTest"/>
+        </classes>
+    </test>
+    <test name="ManagePermissionsTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.document.ManagePermissionsTest"/>
+        </classes>
+    </test>
+    <test name="InviteMembersPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.InviteMembersPageTest" />
+        </classes>
+    </test>
+    <test name="SiteFinderPageTest">
+        <classes>
+            <class name="org.alfresco.po.share.site.SiteFinderPageTest" />
+        </classes>
+    </test>
+</suite>
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
index 454344ae..a06c7f62 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share-amp/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>share-po</artifactId>
-            <version>${share.po.version}</version>
+            <version>${alfresco.version}</version>
             <scope>test</scope>
         </dependency>
         <!-- Bring in the Share Page Object (PO) Tests that comes with Alfresco. It has
@@ -66,9 +66,28 @@
         <dependency>
             <groupId>${alfresco.groupId}</groupId>
             <artifactId>share-po</artifactId>
-            <version>${share.po.version}</version>
+            <version>${alfresco.version}</version>
             <classifier>tests</classifier>
             <scope>test</scope>
+
+            <!-- Exclude version 2.39.0 of selenium that does not work with latest FF browsers, we include
+               version 2.45 later on here -->
+            <exclusions>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-java</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.seleniumhq.selenium</groupId>
+                    <artifactId>selenium-server</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <!-- Bring in newer selenium version -->
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>2.45.0-alfresco</version>
         </dependency>
         <!-- Test NG is defined with test scope in share-po, so need it here too -->
         <!-- Alfresco code creates a wrapper around Test NG -->
diff --git a/archetypes/alfresco-amp-archetype/pom.xml b/archetypes/alfresco-amp-archetype/pom.xml
index 3ea1e7f1..8a7943e2 100644
--- a/archetypes/alfresco-amp-archetype/pom.xml
+++ b/archetypes/alfresco-amp-archetype/pom.xml
@@ -23,6 +23,7 @@
             <includes>
                 <include>archetype-resources/pom.xml</include>
                 <include>archetype-resources/run.sh</include>
+                <include>archetype-resources/run.bat</include>
                 <include>META-INF/maven/archetype-metadata.xml</include>
             </includes>
             <filtering>true</filtering>
@@ -32,6 +33,7 @@
             <excludes>
                 <exclude>archetype-resources/pom.xml</exclude>
                 <exclude>archetype-resources/run.sh</exclude>
+                <exclude>archetype-resources/run.bat</exclude>
                 <exclude>META-INF/maven/archetype-metadata.xml</exclude>
             </excludes>
             <filtering>false</filtering>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index df8b9c3b..2ad849e1 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -59,6 +59,7 @@
             <directory></directory>
             <includes>
                 <include>run.sh</include>
+                <include>run.bat</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
index f9c57f5a..67d485b3 100644
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/run.bat
@@ -7,7 +7,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @echo off
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.3.RELEASE\springloaded-1.2.3.RELEASE.jar
+set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
 
 if not exist %springloadedfile% (
   mvn validate -Psetup
diff --git a/archetypes/share-amp-archetype/pom.xml b/archetypes/share-amp-archetype/pom.xml
index e6860db7..8b3b5be6 100644
--- a/archetypes/share-amp-archetype/pom.xml
+++ b/archetypes/share-amp-archetype/pom.xml
@@ -25,6 +25,7 @@
                 <includes>
                     <include>archetype-resources/pom.xml</include>
                     <include>archetype-resources/run.sh</include>
+                    <include>archetype-resources/run.bat</include>
                     <include>META-INF/maven/archetype-metadata.xml</include>
                 </includes>
                 <filtering>true</filtering>
@@ -34,6 +35,7 @@
                 <excludes>
                     <exclude>archetype-resources/pom.xml</exclude>
                     <exclude>archetype-resources/run.sh</exclude>
+                    <exclude>archetype-resources/run.bat</exclude>
                     <exclude>META-INF/maven/archetype-metadata.xml</exclude>
                 </excludes>
                 <filtering>false</filtering>
diff --git a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index b721c89c..ca5f0145 100644
--- a/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/share-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -56,6 +56,7 @@
             <directory></directory>
             <includes>
                 <include>run.sh</include>
+                <include>run.bat</include>
             </includes>
         </fileSet>
     </fileSets>
diff --git a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
index dae73735..7c7afed6 100644
--- a/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
+++ b/archetypes/share-amp-archetype/src/main/resources/archetype-resources/run.bat
@@ -8,7 +8,7 @@
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 @echo off
 
-set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\1.2.3.RELEASE\springloaded-1.2.3.RELEASE.jar
+set springloadedfile=%HOME%\.m2\repository\org\springframework\springloaded\@@springloaded.version@@\springloaded-@@springloaded.version@@.jar
 
 if not exist %springloadedfile% (
   mvn validate -Psetup