diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic/archetype.properties b/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties
similarity index 100%
rename from archetypes/activiti-jar-archetype/src/test/resources/projects/basic/archetype.properties
rename to archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/archetype.properties
diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/basic/goal.txt b/archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt
similarity index 100%
rename from archetypes/activiti-jar-archetype/src/test/resources/projects/basic/goal.txt
rename to archetypes/activiti-jar-archetype/src/test/resources/projects/basic-enterprise/goal.txt
diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/archetype.properties b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties
similarity index 100%
rename from archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/archetype.properties
rename to archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/archetype.properties
diff --git a/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/goal.txt b/archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt
similarity index 100%
rename from archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic/goal.txt
rename to archetypes/activiti-jar-archetype/src/test/resources/projects/run-basic-enterprise/goal.txt
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 a35bded9..1746375d 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
@@ -120,14 +120,14 @@
                  They are defined in alfresco-platform-distribution... -->
             <dependency>
                 <groupId>${alfresco.groupId}</groupId>
-                <artifactId>${alfresco.share.war.artifactId}</artifactId>
+                <artifactId>share</artifactId>
                 <version>${alfresco.share.version}</version>
                 <type>war</type>
                 <scope>provided</scope>
             </dependency>
             <dependency>
                 <groupId>${alfresco.groupId}</groupId>
-                <artifactId>${alfresco.share.war.artifactId}</artifactId>
+                <artifactId>share</artifactId>
                 <version>${alfresco.share.version}</version>
                 <classifier>classes</classifier>
                 <scope>provided</scope>
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..b3d65051
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,4 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=allInOneTestRunEnterprise
+package=it.pkg
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..1874e9c0
--- /dev/null
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@
\ No newline at end of file
diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt
index 7c32f559..f7ffc47a 100644
--- a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-basic/goal.txt
@@ -1 +1 @@
-install
+install
\ No newline at end of file
diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..c614b155
--- /dev/null
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,4 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=repoJarTestRunEnterprise
+package=it.pkg
\ No newline at end of file
diff --git a/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..1874e9c0
--- /dev/null
+++ b/archetypes/alfresco-platform-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@
\ No newline at end of file
diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
new file mode 100644
index 00000000..8ea0dbb4
--- /dev/null
+++ b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/archetype.properties
@@ -0,0 +1,4 @@
+version=0.1-SNAPSHOT
+groupId=archetype.it
+artifactId=shareJarTestRunEnterprise
+package=it.pkg
diff --git a/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
new file mode 100644
index 00000000..1874e9c0
--- /dev/null
+++ b/archetypes/alfresco-share-jar-archetype/src/test/resources/projects/run-enterprise/goal.txt
@@ -0,0 +1 @@
+install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 44ac26e9..e1127413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <url>${maven.site.url}</url>
 
     <prerequisites>
-        <maven>3.0.3</maven>
+        <maven>3.3.0</maven>
     </prerequisites>
 
     <licenses>
@@ -123,9 +123,11 @@
         <module>plugins/alfresco-maven-plugin</module>
         <!-- Archetypes -->
         <module>archetypes/alfresco-platform-jar-archetype</module>
+
         <module>archetypes/alfresco-share-jar-archetype</module>
         <module>archetypes/alfresco-allinone-archetype</module>
         <module>archetypes/activiti-jar-archetype</module>
+
   </modules>
 
     <properties>
@@ -138,6 +140,8 @@
 
         <!-- The following version is needed for alfresco-rad -->
         <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
+        <alfresco.enterprise.default.version>5.2.0</alfresco.enterprise.default.version>
+        <alfresco.sdk.default.edition>community</alfresco.sdk.default.edition>
 
         <scm.url.base>https://github.com/Alfresco/alfresco-sdk</scm.url.base>
     </properties>
@@ -237,14 +241,17 @@
             <build>
                 <testResources>
                     <testResource>
+                        <filtering>true</filtering>
                         <directory>src/test/resources</directory>
                         <excludes>
                             <exclude>${alfresco.sdk.tests.exclude}</exclude>
                         </excludes>
                     </testResource>
                 </testResources>
+
             </build>
         </profile>
+
         <profile>
             <id>enterprise-tests</id>
             <properties>