diff --git a/.gitignore b/.gitignore
index 746231c2..81737110 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ target/
 *.iml
 .idea/compiler.xml
 .idea/encodings.xml
+.idea/findbugs-idea.xml
 .idea/copyright/profiles_settings.xml
 .idea/libraries/Maven__com_carrotsearch_hppc_0_5_3.xml
 .idea/libraries/Maven__com_carrotsearch_junit_benchmarks_0_7_2.xml
diff --git a/pom.xml b/pom.xml
index 0faa409d..3a278411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,6 +190,26 @@
         </plugin>
       </plugins>
     </pluginManagement>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>${version.maven-enforcer-plugin}</version>
+        <configuration>
+          <rules>
+            <DependencyConvergence/>
+          </rules>
+        </configuration>
+        <executions>
+          <execution>
+            <id>enforce-dependency-convergence</id>
+            <goals>
+              <goal>enforce</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
   </build>
 
   <profiles>
@@ -336,6 +356,12 @@
           <artifactId>randomizedtesting-runner</artifactId>
           <version>${version.randomizedtesting}</version>
           <scope>test</scope>
+          <exclusions>
+            <exclusion><!-- prevents maven-enforcer DependencyConvergence error - bring in our own version below -->
+              <groupId>junit</groupId>
+              <artifactId>junit</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
 
         <dependency>