Applying fix for REGISTRY-2116 (test)