percona test: Preserve the two optimizer tweaks required to make it work smoothly