PORT: Backporting the test fix to trunk from branches [19590].
PORT: Backporting the test fix to trunk from branches [19590].


dmsurti/mayavi,alexandreleroux/mayavi,liulion/mayavi,dmsurti/mayavi,liulion/mayavi,alexandreleroux/mayavi