use test specific shell variables

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

Merge request reports