Fix issue with tempest tests

Change-Id: I20cce5910c4b166531267ce4014dfadbb83cc31c
Merge "Fix issue with tempest tests"