Use short queue while we are still in testing