diff --git a/mysql-test/main/tls_version.result b/mysql-test/main/tls_version.result
index 3d9565983e834..9561c5f5712e4 100644
--- a/mysql-test/main/tls_version.result
+++ b/mysql-test/main/tls_version.result
@@ -1,15 +1,25 @@
+#default is highest available version: TLSv1.2
 Variable_name	Value
 Ssl_version	TLSv1.2
+# TLSv1.2
 Variable_name	Value
 Ssl_version	TLSv1.2
+# TLSv1.1
 Variable_name	Value
 Ssl_version	TLSv1.1
+# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
 Variable_name	Value
 Ssl_version	TLSv1.1
+# TLSv1.3 is not enabled, so TLSv1.2 should be used
 Variable_name	Value
 Ssl_version	TLSv1.2
+# Highest TLS version number should be used (TLSv1.2)
 Variable_name	Value
 Ssl_version	TLSv1.2
+# TLS v1.0 is no longer supported, an attempt to set it is ignored
+Variable_name	Value
+Ssl_version	TLSv1.2
+# finally list available protocols
 @@tls_version
 TLSv1.1,TLSv1.2
 call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
diff --git a/mysql-test/main/tls_version.test b/mysql-test/main/tls_version.test
index 50448f898e9c6..d973f151e566c 100644
--- a/mysql-test/main/tls_version.test
+++ b/mysql-test/main/tls_version.test
@@ -2,24 +2,21 @@
 # with support for SSL.
 
 -- source include/have_ssl_communication.inc
-#default is highest available version: TLSv1.2
+--echo #default is highest available version: TLSv1.2
 --exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
-# TLSv1.2
+--echo # TLSv1.2
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
-# TLSv1.1
+--echo # TLSv1.1
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
-# if a gap is between TLS versions, lowest version number should be used (TLS1.1)
+--echo # if a gap is between TLS versions, lowest version number should be used (TLS1.1)
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.3 -e "show status like 'ssl_version';"
-# TLSv1.3 is not enabled, so TLSv1.2 should be used
+--echo # TLSv1.3 is not enabled, so TLSv1.2 should be used
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2,TLSv1.3 -e "show status like 'ssl_version';"
-# Highest TLS version number should be used (TLSv1.2)
+--echo # Highest TLS version number should be used (TLSv1.2)
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1,TLSv1.2 -e "show status like 'ssl_version';"
-# Errors:
-# TLS v1.0 is disabled on server, so we should get an error
---replace_regex /2026 SSL connection error.*/2026 SSL connection error: xxxx/
---error 1
+--echo # TLS v1.0 is no longer supported, an attempt to set it is ignored
 --exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
-# finally list available protocols
+--echo # finally list available protocols
 --exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"
 
 call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
diff --git a/mysql-test/main/tls_version1.opt b/mysql-test/main/tls_version1.opt
deleted file mode 100644
index 91715074d40cd..0000000000000
--- a/mysql-test/main/tls_version1.opt
+++ /dev/null
@@ -1 +0,0 @@
---tls_version=TLSv1.0
diff --git a/mysql-test/main/tls_version1.result b/mysql-test/main/tls_version1.result
deleted file mode 100644
index caabed832cb5b..0000000000000
--- a/mysql-test/main/tls_version1.result
+++ /dev/null
@@ -1,8 +0,0 @@
-Variable_name	Value
-Ssl_version	TLSv1
-Variable_name	Value
-Ssl_version	TLSv1
-@@tls_version
-TLSv1.0
-call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
-FOUND 1 /TLSv1.0 and TLSv1.1 are insecure/ in mysqld.1.err
diff --git a/mysql-test/main/tls_version1.test b/mysql-test/main/tls_version1.test
deleted file mode 100644
index 788284c36df63..0000000000000
--- a/mysql-test/main/tls_version1.test
+++ /dev/null
@@ -1,17 +0,0 @@
-# Tests for SSL connections, only run if mysqld is compiled
-# with support for SSL.
-
--- source include/have_ssl_communication.inc
---exec $MYSQL --host=localhost --ssl -e "show status like 'ssl_version';"
---error 1
---exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.2 -e "show status like 'ssl_version';"
---error 1
---exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.1 -e "show status like 'ssl_version';"
---exec $MYSQL --host=localhost --ssl --tls_version=TLSv1.0 -e "show status like 'ssl_version';"
---exec $MYSQL --host=localhost --ssl -e "select @@tls_version;"
-
-call mtr.add_suppression("TLSv1.0 and TLSv1.1 are insecure");
---let SEARCH_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
---let SEARCH_PATTERN= TLSv1.0 and TLSv1.1 are insecure
---source include/search_pattern_in_file.inc
-