VF-5854 and VF-5864, regression tests made critical