RT#85252: change to fix pod test failure

This fixes the main issue but does not limit when the test is run as suggested in the ticket