FLUID-4661: fixed broken test

Fixed a broken test that was masquerading as a global failure.
Merge branch 'FLUID-4661'

* FLUID-4661:
  FLUID-4661: fixed broken test