diff --git a/net/http/src/TCivetweb.cxx b/net/http/src/TCivetweb.cxx
index ad685610bd3d8..e6aa10f5b67cd 100644
--- a/net/http/src/TCivetweb.cxx
+++ b/net/http/src/TCivetweb.cxx
@@ -602,7 +602,7 @@ Int_t TCivetweb::ChangeNumActiveThrerads(int cnt)
 ///
 ///     thrds=N               - there N is number of threads used by the civetweb (default is 10)
 ///     top=name              - configure top name, visible in the web browser
-///     ssl_certificate=filename - SSL certificate, see docs/OpenSSL.md from civetweb
+///     ssl_cert=filename     - SSL certificate, see docs/OpenSSL.md from civetweb
 ///     auth_file=filename    - authentication file name, created with htdigets utility
 ///     auth_domain=domain    - authentication domain
 ///     websocket_timeout=tm  - set web sockets timeout in seconds (default 300)
@@ -684,7 +684,9 @@ Bool_t TCivetweb::Create(const char *args)
             if (adomain)
                auth_domain = adomain;
 
-            const char *sslc = url.GetValueFromOptions("ssl_cert");
+            const char *sslc = url.GetValueFromOptions("ssl_certificate");
+            if (!sslc)
+               sslc = url.GetValueFromOptions("ssl_cert");
             if (sslc)
                ssl_cert = sslc;
 
diff --git a/net/http/test/CMakeLists.txt b/net/http/test/CMakeLists.txt
index 8723eb153f70e..bddab5160b8af 100644
--- a/net/http/test/CMakeLists.txt
+++ b/net/http/test/CMakeLists.txt
@@ -30,6 +30,13 @@ execute_process(
     OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
+if(ssl)
+  find_program(OPENSSL_EXECUTABLE openssl)
+  if(OPENSSL_EXECUTABLE)
+    ROOT_ADD_GTEST(testHttpsServer test_ssl_server.cxx LIBRARIES RHTTP RHTTPSniff Hist)
+  endif()
+endif()
+
 # only newer curl support websockets - so test version
 # curl introduce support from 8.11 but it works reliably only with 8.18
 if(CURL_CLI_OUTPUT MATCHES "curl ([0-9]+\\.[0-9]+\\.[0-9]+)")
diff --git a/net/http/test/test_ssl_server.cxx b/net/http/test/test_ssl_server.cxx
new file mode 100644
index 0000000000000..8c5620259ab38
--- /dev/null
+++ b/net/http/test/test_ssl_server.cxx
@@ -0,0 +1,110 @@
+#include "gtest/gtest.h"
+
+#include <string>
+#include <fstream>
+#include <iostream>
+
+#include "THttpServer.h"
+#include "TROOT.h"
+
+#include "TSystem.h"
+#include "TNamed.h"
+#include "TRandom.h"
+
+#include "ROOT/TestSupport.hxx"
+
+#include "./test_suite.cxx"
+
+void cleanup_files()
+{
+   gSystem->Unlink("server.pem");
+   gSystem->Unlink("server.crt");
+   gSystem->Unlink("server.key");
+   gSystem->Unlink("server.key.orig");
+}
+
+// main http server
+TEST(THttpServer, ssl)
+{
+   cleanup_files();
+
+   int res = gSystem->Exec("openssl genrsa -des3 -passout pass:aaaa -out server.key 2048");
+   EXPECT_EQ(res, 0) << "Generate new RSA key";
+   if (res) {
+      cleanup_files();
+      return;
+   }
+
+   res = gSystem->Exec("openssl req -new -passin pass:aaaa -key server.key -subj \"/C=GE/ST=Hesse/L=Darmstadt/O=GSI/CN=localhost\" -out server.csr");
+   EXPECT_EQ(res, 0) << "Generate new server key";
+   if (res) {
+      cleanup_files();
+      return;
+   }
+
+   gSystem->CopyFile("server.key", "server.key.orig");
+
+   res = gSystem->Exec("openssl rsa -in server.key.orig -passin pass:aaaa -out server.key");
+   EXPECT_EQ(res, 0) << "Convert key into RSA";
+   if (res) {
+      cleanup_files();
+      return;
+   }
+
+   res = gSystem->Exec("openssl x509 -req -days 3650 -in server.csr -signkey server.key -out server.crt");
+   EXPECT_EQ(res, 0) << "Generate server certificate";
+   if (res) {
+      cleanup_files();
+      return;
+   }
+
+   res = gSystem->Exec("cat server.crt server.key > server.pem");
+   EXPECT_EQ(res, 0) << "Generate server certificate";
+   if (res) {
+      cleanup_files();
+      return;
+   }
+
+   if (gSystem->AccessPathName("server.pem")) {
+      std::cerr << "Fail to access server.pem file";
+      cleanup_files();
+      return;
+   }
+
+   if (gSystem->AccessPathName("server.crt")) {
+      std::cerr << "Fail to access server.crt file";
+      cleanup_files();
+      return;
+   }
+
+   THttpServer serv("");
+
+   gRandom->SetSeed(0);
+
+   Int_t httpport = 0;
+
+   for(int ntry = 0; ntry < 100; ++ntry) {
+      Int_t port = (Int_t) (25000 + gRandom->Rndm() * 1000);
+      // only two threads, bind to loopback address only
+      TString arg = TString::Format("https:%d?loopback&ssl_cert=server.pem&thrds=3", port);
+      if (serv.CreateEngine(arg)) {
+         httpport = port;
+         break;
+      }
+   }
+
+   EXPECT_NE(httpport, 0);
+
+   if (!httpport) {
+      cleanup_files();
+      return;
+   }
+
+   server_hash = httpport;
+   unix_socket = "--cacert server.crt"; // curl argument
+   server_url = TString::Format("https:/localhost:%d", httpport);
+
+   test_suite(serv);
+
+   cleanup_files();
+}