diff --git a/.travis.yml b/.travis.yml
index 39b742d41..1062d9906 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ jobs:
         - programs/test/selftest
         - tests/scripts/test_psa_constant_names.py
         - tests/ssl-opt.sh
-        # Modern OpenSSL does not support fixed ECDH or null ciphers.
+        # Modern OpenSSL does not support null ciphers.
         - tests/compat.sh -p OpenSSL -e 'NULL'
         - tests/scripts/travis-log-failure.sh
         # GnuTLS supports CAMELLIA but compat.sh doesn't properly enable it.
diff --git a/tests/compat.sh b/tests/compat.sh
index 5ad48b2e8..12613bfe8 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -614,7 +614,7 @@ setup_arguments()
     esac
 
     case $($OPENSSL ciphers ALL) in
-        *ECDH-ECDSA*) O_SUPPORT_ECDH="YES";;
+        *ECDH-ECDSA*|*ECDH-RSA*) O_SUPPORT_ECDH="YES";;
         *) O_SUPPORT_ECDH="NO";;
     esac
 
@@ -834,7 +834,7 @@ run_client() {
             if [ $EXIT -eq 0 ]; then
                 RESULT=0
             else
-                # If the cipher isn't supported...
+                # If it is NULL cipher ...
                 if grep 'Cipher is (NONE)' $CLI_OUT >/dev/null; then
                     RESULT=1
                 else