diff --git a/sonar/examples/pom.xml b/sonar/examples/pom.xml
index 641b47ab5..4f13ac70b 100644
--- a/sonar/examples/pom.xml
+++ b/sonar/examples/pom.xml
@@ -13,6 +13,12 @@
 
     <name>Apache POI Examples package</name>
     
+	<properties>
+		<!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks  -->
+		<sonar.sources>${basedir}/../../src/examples/src</sonar.sources>
+		<!-- tests are automatically found in Maven -->
+	</properties>
+
     <build>
 		<plugins>
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
diff --git a/sonar/excelant/pom.xml b/sonar/excelant/pom.xml
index 2efd54490..66ec9bbeb 100644
--- a/sonar/excelant/pom.xml
+++ b/sonar/excelant/pom.xml
@@ -13,6 +13,12 @@
 
     <name>Apache POI ExcelAnt package</name>
 
+	<properties>
+		<!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks  -->
+		<sonar.sources>${basedir}/../../src/excelant/java</sonar.sources>
+		<!-- tests are automatically found in Maven -->
+	</properties>
+
     <build>
 		<plugins>
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index d96222975..d762c9050 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -13,6 +13,12 @@
 
     <name>Apache POI Main package</name>
 
+	<properties>
+		<!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks  -->
+		<sonar.sources>${basedir}/../../src/java</sonar.sources>
+		<!-- tests are automatically found in Maven -->
+	</properties>
+
     <build>
 		<plugins>
 			<!-- copy sources, resources and tests in place as otherwise Sonar does not pick them up correctly! -->
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 4df81fe12..42bd514e1 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -12,6 +12,12 @@
     <packaging>jar</packaging>
 
     <name>Apache POI OOXML package</name>
+
+	<properties>
+		<!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks  -->
+		<sonar.sources>${basedir}/../../src/ooxml/java</sonar.sources>
+		<!-- tests are automatically found in Maven -->
+	</properties>
 	
     <build>
 		<plugins>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 7c1beeac3..cc53d40f3 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -65,9 +65,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>ASCII</project.build.sourceEncoding>
-		<sonar.sources>${basedir}/../src/contrib/src,${basedir}/../src/examples/src,${basedir}/../src/excelant/java,${basedir}/../src/java,${basedir}/../src/ooxml/java,${basedir}/../src/scratchpad/examples,${basedir}/../src/,${basedir}/../src/scratchpad/src</sonar.sources>
-		<!-- tests are automatically found in Maven ../src/integrationtest,../src/contrib/testcases,../src/excelant/testcases,../src/ooxml/testcases,../src/scratchpad/testcases,../src/testcases -->
-  </properties>
+	</properties>
   
     <build>
         <pluginManagement>
diff --git a/sonar/scratchpad/pom.xml b/sonar/scratchpad/pom.xml
index c3dc3112a..46f37439f 100644
--- a/sonar/scratchpad/pom.xml
+++ b/sonar/scratchpad/pom.xml
@@ -14,10 +14,12 @@
     <name>Apache POI Scratchpad package</name>
 
 	<properties>
+		<!-- specify actual source directory as otherwise Sonar-plugin will fail during SVN checks  -->
+		<sonar.sources>${basedir}/../../src/scratchpad/examples,${basedir}/../../src/scratchpad/src</sonar.sources>
+		<!-- tests are automatically found in Maven -->
 		<!-- Exclude some generated code from Sonar analysis -->
 		<sonar.exclusions>src/main/java/org/apache/poi/hwpf/model/types/*,src/main/java/org/apache/poi/hdf/model/hdftypes/definitions/*</sonar.exclusions>
 	</properties>
- 
 
     <build>
 		<plugins>