Fix the Shim tests timeouts.
(cherry picked from commit 515a48d)