diff --git a/pom.xml b/pom.xml
index d59085a..ae8a25f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2016, Yahoo! Inc.
+<!-- Copyright 2015, Yahoo! Inc.
      Licensed under the terms of the Apache License 2.0.
      See LICENSE file at the project root for terms. -->
 
@@ -321,63 +321,22 @@
       <!-- Code coverage plugin, generates coverage report to target/site/jacoco/
            To skip coverage generation add -Djacoco.skip=true -->
       <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.7.9</version>
-        <executions>
-          <!-- Prepares the property pointing to the JaCoCo runtime agent which
-               is passed as VM argument when Maven the Surefire plugin is executed. -->
-          <execution>
-            <id>pre-unit-test</id>
-            <goals>
-              <goal>prepare-agent</goal>
-            </goals>
-            <configuration>
-              <!-- Sets the path to the file which contains the execution data. -->
-              <destFile>${jacoco.ut.execution.data.file}</destFile>
-              <!-- Sets the name of the property containing the settings for JaCoCo runtime agent.
-                   Used by the surefire plugin -->
-              <propertyName>JaCoCoArgLine</propertyName>
-            </configuration>
-          </execution>
-          <!-- Ensures that the code coverage report for unit tests is created after
-               unit tests have been run. -->
-          <execution>
-            <id>post-unit-test</id>
-            <phase>test</phase>
-            <goals>
-              <goal>report</goal>
-            </goals>
-            <configuration>
-              <!-- Sets the path to the file which contains the execution data. -->
-              <dataFile>${jacoco.ut.execution.data.file}</dataFile>
-              <!-- Sets the output directory for the code coverage report. -->
-              <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-            </configuration>
-          </execution>
-          <execution>
-            <id>default-check</id>
-            <goals>
-              <goal>check</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <!-- implementation is needed only for Maven 2 -->
-                <rule implementation="org.jacoco.maven.RuleConfiguration">
-                  <element>BUNDLE</element>
-                  <limits>
-                    <!-- implementation is needed only for Maven 2 -->
-                    <limit implementation="org.jacoco.report.check.Limit">
-                      <counter>INSTRUCTION</counter>
-                      <value>COVEREDRATIO</value>
-                      <minimum>0.90</minimum>
-                    </limit>
-                  </limits>
-                </rule>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
+          <groupId>org.jacoco</groupId>
+          <artifactId>jacoco-maven-plugin</artifactId>
+          <executions>
+              <execution>
+                  <goals>
+                      <goal>prepare-agent</goal>
+                  </goals>
+              </execution>
+              <execution>
+                  <id>report</id>
+                  <phase>test</phase>
+                  <goals>
+                      <goal>report</goal>
+                  </goals>
+              </execution>
+          </executions>
       </plugin>
 
       <!-- Coveralls is a online code coverage reporting tool that leverages JaCoCo -->
@@ -391,20 +350,8 @@
       </plugin>
 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.20.1</version>
-        <configuration>
-          <!-- locale settings must be set on the command line before startup -->
-          <!-- set heap size to work around https://github.com/travis-ci/travis-ci/issues/3396 -->
-          <!-- Eclipse runtime config for TestNG will only look at the first argLine definition.
-               When running Maven test, the second one will override the first and pull in the
-               JaCoCo arguments. This is a hack to fix a nasty Eclipse bug. -->
-          <argLine> -Xmx1024m -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 </argLine>
-          <argLine> -Xmx1024m -Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8 ${JaCoCoArgLine} </argLine>
-          <useFile>false</useFile>
-          <redirectTestOutputToFile>false</redirectTestOutputToFile>
-        </configuration>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
       </plugin>
 
     </plugins>
@@ -472,6 +419,18 @@
           <version>1.6.0</version>
         </plugin>
 
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.20.1</version>
+        </plugin>
+
+        <plugin>
+            <groupId>org.jacoco</groupId>
+            <artifactId>jacoco-maven-plugin</artifactId>
+            <version>0.7.9</version>
+        </plugin>
+
       </plugins>
     </pluginManagement>
   </build>