Resolve #3573047 "Get tests working"

Joël Pittetrequested to merge
issue/conditional_fields-3573047:3573047-get-tests-working into 4.x

Closes #3573047

Merge request reports