diff --git a/test/testbufferoverrun.cpp b/test/testbufferoverrun.cpp
index e53f2a323b2..ce7b9428d1f 100644
--- a/test/testbufferoverrun.cpp
+++ b/test/testbufferoverrun.cpp
@@ -4283,8 +4283,9 @@ class TestBufferOverrun : public TestFixture {
                                    "    <arg nr=\"3\"/>\n"
                                    "  </function>\n"
                                    "</def>";
-        /*const*/ Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).build();
-        settings.platform.sizeof_wchar_t = 4;
+        // use a platform which has wchar_t with a sizeof 4
+        const Settings settings = settingsBuilder().libraryxml(xmldata).severity(Severity::warning).platform(Platform::Unix32).build();
+        ASSERT_EQUALS(4, settings.platform.sizeof_wchar_t);
 
         check("void f() {\n"
               "    char c[10];\n"
diff --git a/test/testpreprocessor.cpp b/test/testpreprocessor.cpp
index 781f6b6cf35..4adbdef785b 100644
--- a/test/testpreprocessor.cpp
+++ b/test/testpreprocessor.cpp
@@ -1989,9 +1989,9 @@ class TestPreprocessor : public TestFixture {
     }
 
     void inline_suppressions() {
-        /*const*/ Settings settings;
-        settings.inlineSuppressions = true;
-        settings.checks.enable(Checks::missingInclude);
+        const auto settings = dinit(Settings,
+                                    $.inlineSuppressions = true,
+                                        $.checks.enable (Checks::missingInclude));
 
         const char code[] = "// cppcheck-suppress missingInclude\n"
                             "#include \"missing.h\"\n"
@@ -2430,10 +2430,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for existing local include
     void testMissingInclude() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
@@ -2446,10 +2447,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing local include
     void testMissingInclude2() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const char code[] = "#include \"header.h\"";
@@ -2460,10 +2462,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing local include - no include path given
     void testMissingInclude3() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", "inc");
@@ -2476,11 +2479,12 @@ class TestPreprocessor : public TestFixture {
 
     // test for existing local include - include path provided
     void testMissingInclude4() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc"),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", "inc");
@@ -2493,11 +2497,12 @@ class TestPreprocessor : public TestFixture {
 
     // test for existing local include - absolute path
     void testMissingInclude5() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc"),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
@@ -2510,10 +2515,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing local include - absolute path
     void testMissingInclude6() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
@@ -2526,10 +2532,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing system include - system includes are not searched for in relative path
     void testMissingSystemInclude() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
@@ -2542,10 +2549,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing system include
     void testMissingSystemInclude2() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const char code[] = "#include <header.h>";
@@ -2556,28 +2564,30 @@ class TestPreprocessor : public TestFixture {
 
     // test for existing system include in system include path
     void testMissingSystemInclude3() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple", // has no effect
+                                        $.includePaths.emplace_back ("system")
+                                    );
         setTemplateFormat("simple");
-        settings.includePaths.emplace_back("system");
 
         ScopedFile header("header.h", "", "system");
 
         const char code[] = "#include <header.h>";
-        (void)getcodeforcfg(settings0, *this, code, "", "test.c");
+        (void)getcodeforcfg(settings, *this, code, "", "test.c");
 
         ASSERT_EQUALS("", errout_str());
     }
 
     // test for existing system include - absolute path
     void testMissingSystemInclude4() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("inc");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("inc");
+                                    $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "", Path::getCurrentPath());
@@ -2590,10 +2600,11 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing system include - absolute path
     void testMissingSystemInclude5() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         const std::string header = Path::join(Path::getCurrentPath(), "header.h");
@@ -2606,10 +2617,12 @@ class TestPreprocessor : public TestFixture {
 
     // test for missing local and system include
     void testMissingIncludeMixed() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+
+                                        $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
@@ -2627,11 +2640,12 @@ class TestPreprocessor : public TestFixture {
     }
 
     void testMissingIncludeCheckConfig() {
-        /*const*/ Settings settings;
-        settings.clearIncludeCache = true;
-        settings.checks.enable(Checks::missingInclude);
-        settings.includePaths.emplace_back("system");
-        settings.templateFormat = "simple"; // has no effect
+        const auto settings = dinit(Settings,
+                                    $.clearIncludeCache = true,
+                                        $.checks.enable (Checks::missingInclude),
+                                        $.includePaths.emplace_back ("system");
+                                    $.templateFormat = "simple" // has no effect
+                                    );
         setTemplateFormat("simple");
 
         ScopedFile header("header.h", "");
diff --git a/test/testsuppressions.cpp b/test/testsuppressions.cpp
index 77032c50c69..8c32c3ffb53 100644
--- a/test/testsuppressions.cpp
+++ b/test/testsuppressions.cpp
@@ -314,12 +314,12 @@ class TestSuppressions : public TestFixture {
             fileSettings.emplace_back("test.cpp", Standards::Language::CPP, strlen(code));
         }
 
-        /*const*/ auto settings = dinit(Settings,
-                                        $.jobs = 2,
-                                            $.quiet = true,
-                                            $.inlineSuppressions = true);
-        settings.severity.enable(Severity::information);
-        settings.templateFormat = templateFormat;
+        const auto settings = dinit(Settings,
+                                    $.jobs = 2,
+                                        $.quiet = true,
+                                        $.inlineSuppressions = true,
+                                        $.severity.enable (Severity::information),
+                                        $.templateFormat = templateFormat);
 
         Suppressions supprs;
         if (!suppression.empty()) {