diff --git a/tests/catalog/test_hive.py b/tests/catalog/test_hive.py
index a8c0c943da..4bfe2122b7 100644
--- a/tests/catalog/test_hive.py
+++ b/tests/catalog/test_hive.py
@@ -226,7 +226,7 @@ def run(self) -> None:
                     client.write(self._response)
                     client.flush()
             except Exception:
-                pass
+                break
 
     @property
     def port(self) -> int | None:
@@ -234,13 +234,16 @@ def port(self) -> int | None:
         return self._port
 
     def close(self) -> None:
-        # Close all client connections first
+        try:
+            self._socket.close()
+        except Exception:
+            pass
+        self.join(timeout=5)
         for client in self._clients:
             try:
                 client.close()
             except Exception:
                 pass
-        self._socket.close()
 
 
 @pytest.fixture(scope="session")