Fix tests broken in 60953ba

Oops, I accidentally `git stash`ed this patch before merging.