Bug 5327: Shifting a db dependent test to the right place