diff --git a/tests/unit/torrent/test_tracker.py b/tests/unit/torrent/test_tracker.py
index 67448853e..a7c484d92 100644
--- a/tests/unit/torrent/test_tracker.py
+++ b/tests/unit/torrent/test_tracker.py
@@ -44,12 +44,20 @@ class UDPTrackerServerProtocol(asyncio.DatagramProtocol):  # for testing. Not su
 
 class UDPTrackerClientTestCase(AsyncioTestCase):
     async def asyncSetUp(self):
-        self.server = UDPTrackerServerProtocol()
-        transport, _ = await self.loop.create_datagram_endpoint(lambda: self.server, local_addr=("127.0.0.1", 59900))
-        self.addCleanup(transport.close)
-        self.client = TrackerClient(b"\x00" * 48, 4444, [("127.0.0.1", 59900)])
+        self.servers = {}
+        self.client = TrackerClient(b"\x00" * 48, 4444, [])
         await self.client.start()
         self.addCleanup(self.client.stop)
+        await self.add_server()
+
+    async def add_server(self, port=None, add_to_client=True):
+        port = port or len(self.servers) + 59990
+        server = UDPTrackerServerProtocol()
+        transport, _ = await self.loop.create_datagram_endpoint(lambda: server, local_addr=("127.0.0.1", port))
+        self.addCleanup(transport.close)
+        self.servers[port] = server
+        if add_to_client:
+            self.client.servers.append(("127.0.0.1", port))
 
     async def test_announce(self):
         info_hash = random.getrandbits(160).to_bytes(20, "big", signed=False)
@@ -69,7 +77,7 @@ class UDPTrackerClientTestCase(AsyncioTestCase):
     async def test_error(self):
         info_hash = random.getrandbits(160).to_bytes(20, "big", signed=False)
         await self.client.get_peer_list(info_hash)
-        self.server.known_conns.clear()
+        list(self.servers.values())[0].known_conns.clear()
         self.client.results.clear()
         with self.assertRaises(Exception) as err:
             await self.client.get_peer_list(info_hash)