diff --git a/ChangeLog b/ChangeLog
index 0e1823d33..722836e9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,7 +12,7 @@ Bug fixes:
 - #6660 + #6582 Add missing XAtom for utf-8 handling with Xorg
 - #6814 The system asks to save twice. 
 - #6817 Configure requires dns_sd.h for enterprise version
-- #6826 SonarCloud Critical bugs
+- #6826 + #6829 SonarCloud Critical bugs
 - #6821 Blocker bugs found by sonar in synergy and in tests
 - #6825 The system requires google test even when tests are disabled with BUILD_TESTS=OFF
 
diff --git a/src/test/unittests/synergy/ServerArgsParsingTests.cpp b/src/test/unittests/synergy/ServerArgsParsingTests.cpp
index adba4057c..896bf32fe 100644
--- a/src/test/unittests/synergy/ServerArgsParsingTests.cpp
+++ b/src/test/unittests/synergy/ServerArgsParsingTests.cpp
@@ -41,7 +41,7 @@ TEST(ServerArgs, ServerArgs_will_construct_from_copy)
 {
     lib::synergy::ServerArgs serverArgs;
     serverArgs.m_display = "display0";
-    auto serverArgs2 {serverArgs};
+    lib::synergy::ServerArgs serverArgs2 {serverArgs};
     EXPECT_EQ(serverArgs.m_display, serverArgs2.m_display);
 }