diff --git a/.travis.yml b/.travis.yml
index 72ff1c138..3cf563bc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,25 +63,25 @@ jobs:
         - libssh2-1-dev
         - libbrotli-dev
         - libzstd-dev
-  - env:
-    - T=normal C="--with-openssl --with-libssh"
-    # Avoid bionic, its pre-release libssh version triggers deprecation warnings.
-    dist: focal
-    addons:
-      apt:
-        <<: *common_apt
-        packages:
-        - cmake
-        - valgrind
-        - libev-dev
-        - libc-ares-dev
-        - g++-8
-        - stunnel4
-        - libidn2-dev
-        - gnutls-bin
-        # The above list is common_packages minus impacket.
-        - libssh-dev
-        - ninja-build
+#  - env:
+#    - T=normal C="--with-openssl --with-libssh"
+#    # Avoid bionic, its pre-release libssh version triggers deprecation warnings.
+#    dist: focal
+#    addons:
+#      apt:
+#        <<: *common_apt
+#        packages:
+#        - cmake
+#        - valgrind
+#        - libev-dev
+#        - libc-ares-dev
+#        - g++-8
+#        - stunnel4
+#        - libidn2-dev
+#        - gnutls-bin
+#        # The above list is common_packages minus impacket.
+#        - libssh-dev
+#        - ninja-build
   - env:
     - T=normal C="--enable-ares --with-openssl"
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
diff --git a/docs/TODO b/docs/TODO
index ceabee2d9..8ffd750b3 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -181,7 +181,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
+ 20.9 Bring back libssh tests on Travis
 
 ==============================================================================
 
@@ -1263,13 +1263,8 @@
 
  See https://github.com/curl/curl/issues/4477
 
-20.9 Use "random" ports for the test servers
+20.9 Bring back libssh tests on Travis
 
- 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.
+ In https://github.com/curl/curl/pull/7012 we remove the libssh builds and
+ tests from Travis CI due to them not working. This should be remedied and
+ libssh builds be brought back.