diff --git a/tests/README b/tests/README
index ad832b092..8af798d93 100644
--- a/tests/README
+++ b/tests/README
@@ -12,24 +12,28 @@ Requires:
   stunnel (for HTTPS and FTPS tests)
   OpenSSH or SunSSH (for SCP, SFTP and SOCKS4/5 tests)
 
-TCP ports used by default:
+Ports used by default:
 
-  - 8990 on localhost for HTTP tests
-  - 8991 on localhost for HTTPS tests
-  - 8994 on localhost for HTTP IPv6 tests
-  - 8992 on localhost for FTP tests
-  - 8995 on localhost for FTP (2) tests
-  - 8993 on localhost for FTPS tests
-  - 8996 on localhost for FTP IPv6 tests
-  - 8997 on localhost for TFTP tests
-  - 8999 on localhost for SCP/SFTP tests
-  - 9000 on localhost for SOCKS tests
+  - TCP/8990 for HTTP
+  - TCP/8991 for HTTPS
+  - TCP/8992 for FTP
+  - TCP/8993 for FTPS
+  - TCP/8994 for HTTP IPv6
+  - TCP/8995 for FTP (2)
+  - TCP/8996 for FTP IPv6
+  - UDP/8997 for TFTP
+  - UDP/8998 for TFTP IPv6
+  - TCP/8999 for SCP/SFTP
+  - TCP/9000 for SOCKS
+  - TCP/9001 for POP3
+  - TCP/9002 for IMAP
+  - TCP/9003 for SMTP
 
-  The test suite runs simple FTP, HTTP and TFTP servers on these ports to
-  which it makes requests.  For SSL tests, it runs stunnel to handle
-  encryption to the regular servers. For SSH, it runs a standard OpenSSH
-  server. For SOCKS4/5 tests SSH is used to perform the SOCKS functionality
-  and requires a SSH client and server.
+  The test suite runs simple FTP, POP3, IMAP, SMTP, HTTP and TFTP stand-alone
+  servers on these ports to which it makes requests.  For SSL tests, it runs
+  stunnel to handle encryption to the regular servers. For SSH, it runs a
+  standard OpenSSH server. For SOCKS4/5 tests SSH is used to perform the SOCKS
+  functionality and requires a SSH client and server.
 
   The base port number shown above can be changed using runtests' -b option
   to allow running more than one instance of the test suite simultaneously
@@ -54,16 +58,18 @@ Run:
 
 Shell startup scripts:
   Tests which use the ssh test server, SCP/SFTP/SOCKS tests, might be badly
-  influenced by the output of system wide or user specific shell startup scripts,
-  .bashrc, .profile, /etc/csh.cshrc, .login, /etc/bashrc, etc. which output text
-  messages or escape sequences on user login.  When these shell startup messages
-  or escape sequences are output they might corrupt the expected stream of data
-  which flows to the sftp-server or from the ssh client which can result in bad
-  test behaviour or even prevent the test server from running.
+  influenced by the output of system wide or user specific shell startup
+  scripts, .bashrc, .profile, /etc/csh.cshrc, .login, /etc/bashrc, etc. which
+  output text messages or escape sequences on user login.  When these shell
+  startup messages or escape sequences are output they might corrupt the
+  expected stream of data which flows to the sftp-server or from the ssh
+  client which can result in bad test behaviour or even prevent the test
+  server from running.
 
   If the test suite ssh or sftp server fails to start up and logs the message
   'Received message too long' then you are certainly suffering the unwanted
-  output of a shell startup script.  Locate, cleanup or adjust the shell script.
+  output of a shell startup script.  Locate, cleanup or adjust the shell
+  script.
 
 Memory:
   The test script will check that all allocated memory is freed properly IF
@@ -128,7 +134,7 @@ Remote testing:
 
 TEST CASE NUMBERS
 
- So far, I've used this system:
+ So far, we've used this system:
 
  1   -  99   HTTP
  100 - 199   FTP*
@@ -138,6 +144,7 @@ TEST CASE NUMBERS
  500 - 599   libcurl source code tests, not using the curl command tool
  600 - 699   SCP/SFTP
  700 - 799   SOCKS4 (even numbers) and SOCK5 (odd numbers)
+ 800 - 899   POP3, IMAP, SMTP
  1000 - 1999 miscellaneous*
  2000 - x    multiple sequential protocols per test case*