diff --git a/staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt b/staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt
index daf29e4..964c6c6 100644
--- a/staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt
+++ b/staticlibs/testutils/devicetests/com/android/testutils/PacketResponder.kt
@@ -54,6 +54,7 @@
      */
     fun stop() {
         replyThread.interrupt()
+        replyThread.join()
     }
 
     private inner class ReplyThread(name: String) : Thread(name) {