Bug 25638: Make the tests pass - ignoring the actual issue