[AutoQA] #288: Use proper numbering scheme