gistfile1.txt

diff --git a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java b/core/src/main/java/org/el
index 3c306a1..4ce328b 100644
--- a/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
+++ b/core/src/main/java/org/elasticsearch/bootstrap/JarHell.java
@@ -169,6 +169,9 @@ public class JarHell {
                 if (clazz.equals("org.joda.time.base.BaseDateTime")) {
                     return; // apparently this is intentional... clean this up
                 }
+                if (clazz.startsWith("org.apache.maven.surefire")) {
+                    return; // ridonculous
+                }
                 throw new IllegalStateException("jar hell!" + System.lineSeparator() +
                         "class: " + clazz + System.lineSeparator() +
                         "jar1: " + previous + System.lineSeparator() +
diff --git a/pom.xml b/pom.xml
index 91f5b12..1fdf900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -695,15 +695,24 @@
                     <artifactId>maven-failsafe-plugin</artifactId>
                     <version>2.18.1</version>
                     <configuration>
-                       <skipTests>${skip.integ.tests}</skipTests>
-                       <systemPropertyVariables>
-                           <es.logger.level>${es.logger.level}</es.logger.level>
-                           <tests.rest.suite>${tests.rest.suite}</tests.rest.suite>
-                           <tests.rest.blacklist>${tests.rest.blacklist}</tests.rest.blacklist>
-                           <tests.rest.spec>${tests.rest.spec}</tests.rest.spec>
-                           <tests.rest.load_packaged>${tests.rest.load_packaged}</tests.rest.load_p
-                           <java.io.tmpdir>${integ.temp}</java.io.tmpdir>
-                       </systemPropertyVariables>
+                        <classpathDependencyExcludes>
+                            <classpathDependencyExclude>org.apache.maven.surefire:commons-java5</cl
+                        </classpathDependencyExcludes>
+                        <skipTests>${skip.integ.tests}</skipTests>
+                        <useManifestOnlyJar>false</useManifestOnlyJar>
+                        <systemPropertyVariables>
+                            <es.logger.level>${es.logger.level}</es.logger.level>
+                            <tests.rest.suite>${tests.rest.suite}</tests.rest.suite>
+                            <tests.rest.blacklist>${tests.rest.blacklist}</tests.rest.blacklist>
+                            <tests.rest.spec>${tests.rest.spec}</tests.rest.spec>
+                            <tests.rest.load_packaged>${tests.rest.load_packaged}</tests.rest.load_
+                            <java.io.tmpdir>${integ.temp}/temp</java.io.tmpdir>
+                            <project.basedir>${project.basedir}</project.basedir>
+                            <m2.repository>${settings.localRepository}</m2.repository>
+                            <!-- true if we are running tests from maven (as opposed to IDE, etc).
+                                 allows us to assert certain things work, like libsigar -->
+                            <tests.maven>true</tests.maven>
+                        </systemPropertyVariables>