Fix for hanging test processes on dev1.

+review REVIEW-5232