Testing for DEVOPS-1531