CB-5035 wait to prevent test interference