Change the fix for tests to unbreak the build with postmaster PR: 284154 Reported by: <iron.udjin@gmail.com>