am a73b09bd: Fix broken tests in CP2

* commit 'a73b09bd8df85c93f1c95356efc1c41c103b11cc':
  Fix broken tests in CP2