diff --git a/src/transaction.cc b/src/transaction.cc
index f5ded52464..20278aa0c7 100644
--- a/src/transaction.cc
+++ b/src/transaction.cc
@@ -227,7 +227,9 @@ int Transaction::processConnection(const char *client, int cPort,
     const char *server, int sPort) {
     m_clientIpAddress = client;
     m_serverIpAddress = server;
-    m_requestHostName = server;
+    if (m_requestHostName.empty() == true) {
+        m_requestHostName = server;
+    }
     this->m_clientPort = cPort;
     this->m_serverPort = sPort;
     ms_dbg(4, "Transaction context created.");
diff --git a/test/regression/regression.cc b/test/regression/regression.cc
index 6d7b9dc3a1..c16329bc0b 100644
--- a/test/regression/regression.cc
+++ b/test/regression/regression.cc
@@ -268,15 +268,15 @@ void perform_unit_test(ModSecurityTest<RegressionTest> *test,
 
         auto modsec_transaction = context.create_transaction();
 
+        if (t->hostname != "") {
+            modsec_transaction.setRequestHostName(t->hostname);
+        }
+
         clearAuditLog(modsec_transaction.m_rules->m_auditLog->m_path1);
 
         modsec_transaction.processConnection(t->clientIp.c_str(),
             t->clientPort, t->serverIp.c_str(), t->serverPort);
 
-        if (t->hostname != "") {
-            modsec_transaction.setRequestHostName(t->hostname);
-        }
-
         actions(&r, &modsec_transaction, &context.m_server_log);
 
         modsec_transaction.processURI(t->uri.c_str(), t->method.c_str(),