Fixed issue with parallel tests executions

Change-Id: I6105cf86044a9dc7763e39046d72d0af8097af4d
Closes-Bug: #1285562
Merge "Fixed issue with parallel tests executions"