diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
index 9e87de82..a3c12c4d 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform-jar/src/main/resources/alfresco/module/__artifactId__/context/service-context.xml
@@ -1,23 +1,23 @@
 #set( $symbol_pound = '#' )
-        #set( $symbol_dollar = '$' )
-        #set( $symbol_escape = '\' )
-        <?xml version='1.0' encoding='UTF-8'?>
-        <!--
-            Licensed to the Apache Software Foundation (ASF) under one or more
-            contributor license agreements.  See the NOTICE file distributed with
-            this work for additional information regarding copyright ownership.
-            The ASF licenses this file to You under the Apache License, Version 2.0
-            (the "License"); you may not use this file except in compliance with
-            the License.  You may obtain a copy of the License at
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
 
-            http://www.apache.org/licenses/LICENSE-2.0
+    http://www.apache.org/licenses/LICENSE-2.0
 
-            Unless required by applicable law or agreed to in writing, software
-            distributed under the License is distributed on an "AS IS" BASIS,
-            WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-            See the License for the specific language governing permissions and
-            limitations under the License.
-        -->
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
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
index 1874e9c0..ac141d4f 100644
--- 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
@@ -1 +1 @@
-install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=@@alfresco.sdk.default.edition@@
\ No newline at end of file
+install -Dalfresco.platform.version=@@alfresco.enterprise.default.version@@ -Dalfresco.share.version=@@alfresco.enterprise.default.version@@ -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt
index 7a39afda..b6ba3863 100644
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise42/goal.txt
@@ -1 +1 @@
-install -Dalfresco.platform.version=4.2.7 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
+install -Dalfresco.platform.version=4.2.7 -Dalfresco.share.version=4.2.7 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt
index d6ec5d48..5658ca18 100644
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise50/goal.txt
@@ -1 +1 @@
-install -Dalfresco.platform.version=5.0 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
+install -Dalfresco.platform.version=5.0 -Dalfresco.share.version=5.0 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
diff --git a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt
index ad1128dc..88c3140b 100644
--- a/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt
+++ b/archetypes/alfresco-allinone-archetype/src/test/resources/projects/run-enterprise51/goal.txt
@@ -1 +1 @@
-install -Dalfresco.platform.version=5.1 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
+install -Dalfresco.platform.version=5.1 -Dalfresco.share.version=5.1 -Dmaven.alfresco.edition=enterprise
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 12517960..85efd3a4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,7 @@
         <maven.compiler.target>1.7</maven.compiler.target>
         <maven.archetype.version>3.0.0</maven.archetype.version>
         <alfresco.sdk.parent.version>${project.version}</alfresco.sdk.parent.version>
-        <alfresco.sdk.tests.exclude>*/*-enterprise/*</alfresco.sdk.tests.exclude>
+        <alfresco.sdk.tests.exclude>*/*-enterprise*/*</alfresco.sdk.tests.exclude>
 
         <!-- The following version is needed for alfresco-rad -->
         <alfresco.community.default.version>5.2.e</alfresco.community.default.version>
@@ -176,6 +176,16 @@
                 <version>2.10</version>
             </extension>
         </extensions>
+        <testResources>
+            <testResource>
+                <filtering>true</filtering>
+                <directory>src/test/resources</directory>
+                <excludes>
+                    <exclude>${alfresco.sdk.tests.exclude}</exclude>
+                </excludes>
+            </testResource>
+        </testResources>
+
     </build>
 
     <repositories>
@@ -231,27 +241,6 @@
             </distributionManagement>
         </profile>
 
-        <profile>
-            <id>exclude-enterprise-tests-for-archetypes</id>
-            <activation>
-                <file>
-                    <exists>src/test/resources/projects</exists>
-                </file>
-            </activation>
-            <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>