am 2a269419: Reverts a compatibility change made to two tests

* commit '2a269419dceb1c071c5c5ef5c13fbee6040a20dc':
  Reverts a compatibility change made to two tests