Fix test condition.
Merge topic 'MSVC-features' into next

757c5595 Fix test condition.