diff --git a/pom.xml b/pom.xml
index e79e0fcbc9e..0059a4e9ee4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
 
     <properties>
         <lucene.version>5.1.0</lucene.version>
-        <lucene.maven.version>5.1.0-snapshot-1671277</lucene.maven.version>
+        <lucene.maven.version>5.1.0-snapshot-1671894</lucene.maven.version>
         <tests.jvms>auto</tests.jvms>
         <tests.shuffle>true</tests.shuffle>
         <tests.output>onerror</tests.output>
@@ -66,7 +66,7 @@
         <repository>
             <id>lucene-snapshots</id>
             <name>Lucene Snapshots</name>
-            <url>https://download.elastic.co/lucenesnapshots/1671277</url>
+            <url>https://download.elastic.co/lucenesnapshots/1671894</url>
         </repository>
     </repositories>
 
diff --git a/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java
index c106b853c68..994d3874d98 100644
--- a/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java
+++ b/src/test/java/org/elasticsearch/test/ElasticsearchLuceneTestCase.java
@@ -69,10 +69,4 @@ public abstract class ElasticsearchLuceneTestCase extends LuceneTestCase {
     public static int scaledRandomIntBetween(int min, int max) {
         return RandomizedTest.scaledRandomIntBetween(min, max);
     }
-
-    @AfterClass
-    public static void clearDefaultQueryCache() {
-        // TODO: remove me when https://issues.apache.org/jira/browse/LUCENE-6406 is fixed
-        IndexSearcher.setDefaultQueryCache(null);
-    }
 }