diff --git a/src/CFamily.UnitTests/IntegrationTests/CFamily_CLangAnalyzer_IntegrationTests.cs b/src/CFamily.UnitTests/IntegrationTests/CFamily_CLangAnalyzer_IntegrationTests.cs
index 7c0de7919d..e9979a9d73 100644
--- a/src/CFamily.UnitTests/IntegrationTests/CFamily_CLangAnalyzer_IntegrationTests.cs
+++ b/src/CFamily.UnitTests/IntegrationTests/CFamily_CLangAnalyzer_IntegrationTests.cs
@@ -76,7 +76,7 @@ public void CallAnalyzer_IntegrationTest(string testCaseFileName)
 
             var messages = InvokeAnalyzer(request);
 
-            messages.Should().BeEquivalentTo(expectedMessages, e => e.WithStrictOrdering());
+            messages.Where(x => !string.IsNullOrEmpty(x.Filename)).Should().BeEquivalentTo(expectedMessages, e => e.WithStrictOrdering());
         }
 
         private static void CheckRulesMetadataFilesExist()
diff --git a/src/EmbeddedSonarAnalyzer.props b/src/EmbeddedSonarAnalyzer.props
index 074ead5000..f9008b4588 100644
--- a/src/EmbeddedSonarAnalyzer.props
+++ b/src/EmbeddedSonarAnalyzer.props
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <!-- Note: Guide on how to update the analyzers is on the xtranet! -->
     <EmbeddedSonarAnalyzerVersion>9.12.0.78982</EmbeddedSonarAnalyzerVersion>
-    <EmbeddedSonarCFamilyAnalyzerVersion>6.49.0.62722</EmbeddedSonarCFamilyAnalyzerVersion>
+    <EmbeddedSonarCFamilyAnalyzerVersion>6.50.0.64514</EmbeddedSonarCFamilyAnalyzerVersion>
     <EmbeddedSonarJSAnalyzerVersion>10.8.0.24207</EmbeddedSonarJSAnalyzerVersion>
     <!-- Secrets
 	    Secrets are special case: we get the analyzer binaries from a NuGet package, and the
diff --git a/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs b/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
index 10ec5b9841..1f5053766d 100644
--- a/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
+++ b/src/Integration.Vsix.UnitTests/CFamily/CFamilyEmbeddedSonarWayRulesTests.cs
@@ -54,7 +54,7 @@ public class CFamilyEmbeddedSonarWayRulesTests
         private const int Inactive_C_Rules = 123;
 
         private const int Active_CPP_Rules = 436;
-        private const int Inactive_CPP_Rules = 205;
+        private const int Inactive_CPP_Rules = 206;
 
         private readonly CFamilySonarWayRulesConfigProvider rulesMetadataCache = new CFamilySonarWayRulesConfigProvider(CFamilyShared.CFamilyFilesDirectory);