Merge changes from topic "OOM-1853"

* changes:
  Run env setup only once
  Fix condition for checking if tests are defined