am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins

* commit '984823f543b58ff3c064a203762530f972870d64':
  Fix tests on jenkins