Fix tests on legacy-release
Merged Pull Request #403

* pull-request/403:
  Fix tests on legacy-release