diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template
index 8b385a3d31e..f2d220b29f2 100644
--- a/dev-tools/maven/pom.xml.template
+++ b/dev-tools/maven/pom.xml.template
@@ -545,7 +545,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12</version>
+          <version>2.12.4</version>
           <configuration>
             <runOrder>random</runOrder>
             <reportFormat>plain</reportFormat>
@@ -553,6 +553,7 @@
             <argLine>-Xmx512M</argLine>
             <systemPropertyVariables>
               <tempDir>.</tempDir>
+              <java.awt.headless>true</java.awt.headless>
 
               <!-- See <http://wiki.apache.org/lucene-java/RunningTests>
                    for a description of the tests.* system properties. -->