diff --git a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamSuite.scala
index d79b43569ab21..01ea62a9de4d5 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/streaming/StreamSuite.scala
@@ -534,7 +534,7 @@ class StreamSuite extends StreamTest {
   test("batch id is updated correctly in the job description") {
     val queryName = "memStream"
     @volatile var jobDescription: String = null
-    def assertContainsNameAndBatch(batch: Integer): Unit = {
+    def assertDescContainsQueryNameAnd(batch: Integer): Unit = {
       // wait for listener event to be processed
       spark.sparkContext.listenerBus.waitUntilEmpty(streamingTimeout.toMillis)
       assert(jobDescription.contains(queryName) && jobDescription.contains(s"batch = $batch"))
@@ -557,13 +557,14 @@ class StreamSuite extends StreamTest {
 
     input.addData(1)
     query.processAllAvailable()
-    assertContainsNameAndBatch(batch = 0)
+    assertDescContainsQueryNameAnd(batch = 0)
     input.addData(2, 3)
     query.processAllAvailable()
-    assertContainsNameAndBatch(batch = 1)
+    assertDescContainsQueryNameAnd(batch = 1)
     input.addData(4)
     query.processAllAvailable()
-    assertContainsNameAndBatch(batch = 2)
+    assertDescContainsQueryNameAnd(batch = 2)
+    query.stop()
   }
 }