am 80980574: Fix test breakage

* commit '80980574acfef74f9392da4fdbcba64d911cb66f':
  Fix test breakage