diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index fc22c7d877a..6a530b66d79 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -233,6 +233,9 @@ Build
 * LUCENE-8168: Moved Groovy scripts in build files to separate files.
   Update Groovy to 2.4.13.  (Uwe Schindler)
 
+* LUCENE-8176: HttpReplicatorTest awaits more than a minute for stopping Jetty threads
+  (Mikhail Khludnev)
+
 ======================= Lucene 7.2.1 =======================
 
 Bug Fixes
diff --git a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java
index 98349c35ebe..c482ec27218 100644
--- a/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java
+++ b/lucene/replicator/src/test/org/apache/lucene/replicator/ReplicatorTestCase.java
@@ -16,6 +16,7 @@
  */
 package org.apache.lucene.replicator;
 
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
 import java.util.Random;
 import org.apache.http.conn.HttpClientConnectionManager;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
@@ -33,6 +34,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.eclipse.jetty.util.thread.QueuedThreadPool;
 import org.junit.AfterClass;
 
+@ThreadLeakLingering(linger = 80000) // Jetty might ignore interrupt for a minute 
 public abstract class ReplicatorTestCase extends LuceneTestCase {
   
   private static HttpClientConnectionManager clientConnectionManager;