BUG-1014: adjust compatibility tests