diff --git a/exasol_python_test_framework/exatest/__init__.py b/exasol_python_test_framework/exatest/__init__.py
index a1c5471..9be63c3 100644
--- a/exasol_python_test_framework/exatest/__init__.py
+++ b/exasol_python_test_framework/exatest/__init__.py
@@ -247,7 +247,7 @@ def _parse_opts(self):
                 logdir='.',
                 loglevel='warning',
                 odbc_log='off',
-                ssl_cert='unverified',
+                tls_cert='unverified',
                 connect=None,
                 driver=None,
                 debugger=False,
@@ -290,7 +290,7 @@ def _main(self):
             self.opts.user,
             self.opts.password,
             self.opts.odbc_log,
-            self.opts.ssl_cert,
+            self.opts.tls_cert,
         )
         prepare_ok = self.prepare_hook()
         self.opts.log.info('starting tests')
diff --git a/exasol_python_test_framework/exatest/clients/client_setup.py b/exasol_python_test_framework/exatest/clients/client_setup.py
index 96a02f3..5e9115f 100644
--- a/exasol_python_test_framework/exatest/clients/client_setup.py
+++ b/exasol_python_test_framework/exatest/clients/client_setup.py
@@ -15,7 +15,7 @@
     "verbose": "VERBOSE",
 }
 
-SSL_CERT_OPTIONS = {
+TLS_CERT_OPTIONS = {
     "verify": None,
     "unverified": "SSL_VERIFY_NONE",
 }
@@ -62,14 +62,14 @@ def odbc_arguments(self, parser):
             help='activate ODBC driver log (default: %(default)s)',
         )
         parser.add_argument(
-            "--ssl-cert", choices=SSL_CERT_OPTIONS,
-            help='SSL certificate verification (default: %(default)s)',
+            "--tls-cert", choices=TLS_CERT_OPTIONS,
+            help='TLS certificate verification (default: %(default)s)',
         )
         return parser
 
     def _write_odbcini(self, log_path, server, driver,
                        user, password, odbc_log,
-                       ssl_cert) -> str:
+                       tls_cert) -> str:
         def cleandoc_nl(string):
             return cleandoc(string) + "\n"
 
@@ -91,8 +91,8 @@ def cleandoc_nl(string):
                     CONNECTIONLCNUMERIC = en_US.UTF-8
                     """
             ))
-            if ssl_cert != "verify":
-                file.write(f"SSLCERTIFICATE = {SSL_CERT_OPTIONS[ssl_cert]}\n")
+            if tls_cert != "verify":
+                file.write(f"SSLCERTIFICATE = {TLS_CERT_OPTIONS[tls_cert]}\n")
             if odbc_log != "off":
                 file.write(cleandoc_nl(
                         f"""
@@ -110,7 +110,7 @@ def prepare_odbc_init(
             user,
             password,
             odbc_log,
-            ssl_cert = "unverified",
+            tls_cert = "unverified",
     ):
         path = self._write_odbcini(
             log_path,
@@ -119,6 +119,6 @@ def prepare_odbc_init(
             user,
             password,
             odbc_log,
-            ssl_cert,
+            tls_cert,
         )
         os.environ[ENV_VAR] = path