[3.8] Fix phpunit tests