diff --git a/jenkins/create_jobs.groovy b/jenkins/create_jobs.groovy
index 357ecb11af..8c0fba7a1b 100644
--- a/jenkins/create_jobs.groovy
+++ b/jenkins/create_jobs.groovy
@@ -250,6 +250,11 @@ poijobs.each { poijob ->
                         project / publishers << 'hudson.plugins.cigame.GamePublisher' {}
                     }
                 }
+                archiveJunit('sonar/*/target/surefire-reports/TEST-*.xml') {
+                    testDataPublishers {
+                        publishTestStabilityData()
+                    }
+                }
                 mailer(email, false, false)
             }
         } else if (poijob.javadoc) {
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 2ed5514aef..b269520289 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -103,7 +103,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
 		</plugins>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index f5c23afaf2..65745528a2 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -93,7 +93,7 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>${maven.plugin.surefire.version}</version>
                 <configuration>
-                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -XX:-OmitStackTraceInFastThrow</argLine>
+                    <argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=target/tmp -XX:-OmitStackTraceInFastThrow</argLine>
                 </configuration>
             </plugin>
 		</plugins>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 20c8bc26d1..f28962f69f 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -106,7 +106,7 @@
 						<org.apache.poi.util.POILogger>org.apache.poi.util.NullLogger</org.apache.poi.util.POILogger>
 					</systemPropertyVariables>
 					<!-- use to following to analyze OOM issues:	-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -->
-					<argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m</argLine>
+					<argLine>@{argLine} -Duser.language=en -Duser.country=US -Xmx1024m -Djava.io.tmpdir=target/tmp</argLine>
 					<excludes>
 						<exclude>**/All*Tests.java</exclude>
 						<exclude>**/TestUnfixedBugs.java</exclude>