Fix for non-failing on failed test

Change-Id: I42d4c5d926b3edf33e01f463d4aa0f1ff85c0ee0
Closes-Bug: #1367506