Integration Test Fix - REGISTRY-2336