Bug 15408: Fix tests to fail without patch