Owain,
The most recent version of the FAA Flight Test Guide, AC 25-7C, dated X/X/2012, has this:
(c) Consistency. The stall warning should be reliable and repeatable. The warning must occur with flaps and gear in all normally used positions in both straight and turning flight (§ 25.207(a)) and must continue throughout the stall demonstration until the angleof-attack is reduced to approximately that at which the stall warning was initiated (§ 25.207(c)).
I tend to think that, if your interpretation of the rule had been intended, then that meaning would have been stated more explicitly.