Merge pull request #17153 from serathius/test-fails-with-older-db-file

Merge pull request #17153 from serathius/test-fails-with-older-db-file #2792