Third time's the charm: fix tests on Windows

(I wish we had some real Windows developers who cared.  A 24-hour test
cycle is not exactly optimal.)