Add Felix's changes to use upstream test suite.

Not bumping the version number, since 1.6.2-1 hasn't been submitted
to the upload queue yet.