am 8a4064e2: Fix darwin run-test problems

* commit '8a4064e2c0987637b11afcc656478d3113d81618':
  Fix darwin run-test problems