=htp #15920 fix test-case broken because of merge conflict

Merging #16158 introduced a build error because of a merge error (PR validation ran long before the other change). This fixes the problem.