diff --git a/docs/TODO b/docs/TODO
index fbf2d2520..ddf3652b8 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -163,6 +163,7 @@
  20.6 Use the RFC6265 test suite
  20.7 Support LD_PRELOAD on macOS
  20.8 Run web-platform-tests url tests
+ 20.9 Use "random" ports for the test servers
 
  21. Next SONAME bump
  21.1 http-style HEAD output for FTP
@@ -1096,6 +1097,17 @@ that doesn't exist on the server, just like --ftp-create-dirs.
 
  See https://github.com/curl/curl/issues/4477
 
+20.9 Use "random" ports for the test servers
+
+ Instead of insisting and using fixed port numbers for the tests (even though
+ they can be changed with a switch), consider letting each server pick a
+ random available one at start-up, store that info in a file and let the test
+ suite use that.
+
+ We could then remove the "check that it is our server that's running"-check
+ and we would immediately detect when we write tests wrongly to use hard-coded
+ port numbers.
+
 21. Next SONAME bump
 
 21.1 http-style HEAD output for FTP