diff --git a/build.gradle b/build.gradle
index ec61a39005..27385ac861 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,21 +5,21 @@ subprojects {
 	sourceSets {
 		main {
 			java {
-				srcDir 'source/java'
+				srcDir sourceJavaDir
 			}
 		}
 	}
 
 	repositories { 
 		flatDir {
-			dirs 'libs'
+			dirs libsDir
 		}
 		mavenCentral()  
 	}
 
 	dependencies {
 		
-		compile fileTree(dir: 'libs', include: '*.jar')
+		compile fileTree(dir: libsDir, include: '*.jar')
 		
 		compile fileTree(dir: 'libs/test', include: '*.jar')
 		compile group: 'javax.servlet', name: 'servlet-api', version: '2.5'		
@@ -32,11 +32,11 @@ subprojects {
 				
 		// Clean out any existing jars
 		ant.delete {
-			ant.fileset(dir: 'libs', includes: '*.jar')
+			ant.fileset(dir: libsDir, includes: '*.jar')
 		}		
 	
 		// Unpack WAR
-		ant.unzip(src: warFile, dest: 'libs') {
+		ant.unzip(src: warFile, dest: libsDir) {
 			ant.patternset {
 				ant.include(name: '**/*.jar')
 			}
diff --git a/gradle.properties b/gradle.properties
index 8b13789179..29a87f859d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,2 @@
-
+sourceJavaDir=source/java
+libsDir=libs
diff --git a/rm-server/gradle.properties b/rm-server/gradle.properties
index 16e6a91c08..1014ee0ed2 100644
--- a/rm-server/gradle.properties
+++ b/rm-server/gradle.properties
@@ -1,2 +1,2 @@
-warFile=deps/alfresco.war
+warFile=build/war/alfresco.war
 warFileName=Alfresco
diff --git a/rm-server/libs/test/spring-webscripts-1.0.0-tests.jar b/rm-server/libs/test/spring-webscripts-1.0.0-tests.jar
new file mode 100644
index 0000000000..1b386b0743
Binary files /dev/null and b/rm-server/libs/test/spring-webscripts-1.0.0-tests.jar differ