diff --git a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/rebel.xml b/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/rebel.xml
deleted file mode 100644
index 724b2bf1..00000000
--- a/archetypes/alfresco-amp-archetype/src/main/resources/archetype-resources/src/test/resources/rebel.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is a JRebel configuration file, allows hot re-deploying.
-     If you have JRebel you can enable it by setting the following variables:
-     MAVEN_OPTS=-Xms256m -Xmx2G -XX:PermSize=300m -javaagent:${jrebel.dir}/jrebel.jar
-     
- -->
-<application
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns="http://www.zeroturnaround.com"
-  xsi:schemaLocation="http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
-  <classpath>
-    <dir name="${project.build.outputDirectory}"/>
-    <dir name="${project.build.testOutputDirectory}"/>
-  </classpath>
-  <!--
-  <web>
-    <link target="/">
-      <dir name="${project.build.directory}/${project.build.artifactId}/web"/>
-    </link>
-  </web>
-  -->
-</application>
\ No newline at end of file
diff --git a/modules/alfresco-rad/pom.xml b/modules/alfresco-rad/pom.xml
index bcbf7c10..57297dcb 100644
--- a/modules/alfresco-rad/pom.xml
+++ b/modules/alfresco-rad/pom.xml
@@ -21,6 +21,12 @@
             <artifactId>junit-remote</artifactId>
             <version>3</version>
             <type>jar</type>
+            <exclusions>
+                <exclusion>
+                    <artifactId>servlet-api</artifactId>
+                    <groupId>javax.servlet</groupId>
+                </exclusion>
+            </exclusions>
        </dependency>
        <!-- Required to have annotation based remote testing working -->
        <dependency>
diff --git a/poms/alfresco-sdk-parent/pom.xml b/poms/alfresco-sdk-parent/pom.xml
index 2e4dc6a6..e3f6d9fa 100644
--- a/poms/alfresco-sdk-parent/pom.xml
+++ b/poms/alfresco-sdk-parent/pom.xml
@@ -458,6 +458,13 @@
             <version>${h2-support.version}</version>
             <scope>test</scope>
           </dependency>
+          <!-- Add RAD capabilities for remote JUnit test running (client) -->
+          <dependency>
+              <groupId>org.alfresco.maven</groupId>
+              <artifactId>alfresco-rad</artifactId>
+              <version>${maven.alfresco.version}</version>
+              <scope>test</scope>
+          </dependency>
           <!-- 
           |    Requires this explicit test dependency, for a Spring 3.0.5 bug 
           |    See https://jira.springsource.org/browse/SPR-8527 
@@ -482,13 +489,67 @@
               <classifier>config</classifier>
               <scope>provided</scope>
           </dependency>
-          <!-- Add RAD capabilities for remote JUnit test running -->
+      </dependencies>
+    </profile>
+    
+    <!-- Profile to enable rapid application development with JRebel 
+         and remote JUnit running, needs to be called explicitly 
+         with -Prad -->
+    <profile>
+      <id>rad</id>
+      <build>
+        <plugins>
+            <plugin>
+                <groupId>org.zeroturnaround</groupId>
+                <artifactId>jrebel-maven-plugin</artifactId>
+                <version>1.1.5</version>
+                <executions>
+                  <execution>
+                    <id>generate-rebel-xml</id>
+                    <phase>prepare-package</phase>
+                    <goals>
+                      <goal>generate</goal>
+                    </goals>
+                  </execution>
+                </executions>
+                <configuration>
+                    <packaging>war</packaging>
+                    <generateDefaultElements>false</generateDefaultElements>
+                    <classpath>
+                        <resources>
+                            <resource>
+                                <directory>${project.build.outputDirectory}</directory>
+                            </resource>
+                            <resource>
+                                <directory>${project.build.testOutputDirectory}</directory>
+                            </resource>
+                        </resources>
+                    </classpath>
+                    <web>
+                        <resources>
+                            <resource>
+                                <target>/</target>
+                                <directory>${project.build.directory}/${project.build.finalName}</directory>
+                            </resource>
+                            <resource>
+                                <target>/</target>
+                                <directory>${project.build.directory}/${project.build.finalName}-war</directory>
+                            </resource>
+                        </resources>
+                    </web>
+                </configuration>
+            </plugin>
+        </plugins>
+      </build>
+      <dependencies>
+          <!-- Add RAD capabilities for remote JUnit test running (client) -->
           <dependency>
               <groupId>org.alfresco.maven</groupId>
               <artifactId>alfresco-rad</artifactId>
               <version>${maven.alfresco.version}</version>
           </dependency>
       </dependencies>
+      
     </profile>
     
     <!-- Enable AMP project packing on a WAR and run embedded in Tomcat -->