Merge pull request #10587 from dgquintas/fix_credentials_test

Update credentials test after #9328