diff --git a/Jenkinsfile b/Jenkinsfile
index 6d59ba7..a737165 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@
     remote:        libLazy.remote,
     credentialsId: libLazy.credentialsId
   ]),
-  changelog:  false,
+  changelog: false,
 )
 
 // Load Jenkins shared libraries to customize this project
@@ -73,7 +73,6 @@
     GOOGLE_API_CID:   'dappre-google-api',
   ],
   noIndex:       '(.+_.+|production)',   // Avoid automatic indexing for release and private branches
-  timestampsLog: true,
   xmppTargets:   'noise@conference.qiy.nl',
 )
 
@@ -93,12 +92,32 @@
       sh("git checkout ${lazyConfig['branch']}")
     },
     run: {
-      fastLane('android', 'test')
+      // Check project info with Fastlane
+      withEnv(["VERSION=${currentBuild.displayName}"],) {
+        fastLane('android', 'info')
+      }
     },
     args: "-v /opt/android:/opt/android"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
+    in: [ 'centos7' ],
+    on: 'android',
+  ]
+}
+
+lazyStage {
+  name = 'test'
+  onlyif = (! deployBranches.contains(lazyConfig['branch']) )
+  tasks = [
+    run: {
+      fastLane('android', 'test')
+    },
+    post: {
+      junit(testResults: 'fastlane/report.xml,**/build/test-results/*/*.xml', allowEmptyResults: true)
+    },
+    args: "-v /opt/android:/opt/android"
+      + " -e ANDROID_HOME=${env.ANDROID_HOME}"
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
   ]
@@ -117,11 +136,11 @@
     args: "-v /opt/android:/opt/android"
       + " -v /opt/certificates:/opt/certificates"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
     post: {
+      junit(testResults: 'fastlane/report.xml,**/build/test-results/*/*.xml', allowEmptyResults: true)
       archiveArtifacts(artifacts: "${buildDir}/**", allowEmptyArchive: false)
     },
   ]
@@ -194,8 +213,7 @@
     },
     args: "-v /opt/android:/opt/android"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
   ]
@@ -222,8 +240,7 @@
     },
     args: "-v /opt/android:/opt/android"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
   ]
@@ -243,8 +260,7 @@
     },
     args: "-v /opt/android:/opt/android"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
   ]
@@ -271,8 +287,7 @@
     },
     args: "-v /opt/android:/opt/android"
       + " -e ANDROID_HOME=${env.ANDROID_HOME}"
-      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}"
-	  + " -e FASTLANE_HIDE_TIMESTAMP=true",
+      + " -e GRADLE_USER_HOME=${env.GRADLE_USER_HOME}",
     in: [ 'centos7' ],
     on: 'android',
   ]