Make 'features' testsuite work with the /shared changes.