fix bad dependency in test
Merge branch 'headless' into scala-2.11