use test specific shell variables

Merged Mark Andrews requested to merge marka-resolver-fix-v9_14 into v9_14

Merge request reports