diff --git a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
index bdf0737351f..ed9aac247af 100644
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/sim/TestSimDistributedQueue.java
@@ -215,7 +215,7 @@ public class TestSimDistributedQueue extends SolrTestCaseJ4 {
       super.tearDown();
     } catch (Exception exc) {
     }
-    executor.shutdown();
+    ExecutorUtil.shutdownAndAwaitTermination(executor);
   }
 
 }