diff --git a/analyzers/src/SonarAnalyzer.CSharp/Rules/SelfAssignment.cs b/analyzers/src/SonarAnalyzer.CSharp/Rules/SelfAssignment.cs
index 8c5b03f4c7b..5673e7b2d10 100644
--- a/analyzers/src/SonarAnalyzer.CSharp/Rules/SelfAssignment.cs
+++ b/analyzers/src/SonarAnalyzer.CSharp/Rules/SelfAssignment.cs
@@ -18,10 +18,12 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
+using System.Linq;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Diagnostics;
+using SonarAnalyzer.Extensions;
 using SonarAnalyzer.Helpers;
 using StyleCop.Analyzers.Lightup;
 
@@ -32,25 +34,22 @@ public sealed class SelfAssignment : SelfAssignmentBase<SyntaxKind>
     {
         protected override ILanguageFacade<SyntaxKind> Language => CSharpFacade.Instance;
 
-        protected override void Initialize(SonarAnalysisContext context)
-        {
-            context.RegisterSyntaxNodeActionInNonGenerated(
-                c =>
+        protected override void Initialize(SonarAnalysisContext context) =>
+            context.RegisterSyntaxNodeActionInNonGenerated(c =>
                 {
-                    var expression = (AssignmentExpressionSyntax) c.Node;
+                    var expression = (AssignmentExpressionSyntax)c.Node;
 
                     if (expression.Parent is InitializerExpressionSyntax)
                     {
                         return;
                     }
 
-                    if (CSharpEquivalenceChecker.AreEquivalent(expression.Left, expression.Right))
+                    foreach (var assigment in expression.MapAssignmentArguments().Where(x => CSharpEquivalenceChecker.AreEquivalent(x.Left, x.Right)))
                     {
-                        c.ReportIssue(Diagnostic.Create(Rule, c.Node.GetLocation()));
+                        c.ReportIssue(Diagnostic.Create(Rule, assigment.Left.GetLocation(), additionalLocations: new[] { assigment.Right.GetLocation() }));
                     }
                 },
                 SyntaxKind.SimpleAssignmentExpression,
                 SyntaxKindEx.CoalesceAssignmentExpression);
-        }
     }
 }
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SelfAssignmentTest.cs b/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SelfAssignmentTest.cs
index 0e8774ac2a1..9c0ef72cde2 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SelfAssignmentTest.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/Rules/SelfAssignmentTest.cs
@@ -26,20 +26,21 @@ namespace SonarAnalyzer.UnitTest.Rules
     [TestClass]
     public class SelfAssignmentTest
     {
+        private readonly VerifierBuilder builderCS = new VerifierBuilder<CS.SelfAssignment>();
+        private readonly VerifierBuilder builderVB = new VerifierBuilder<VB.SelfAssignment>();
+
         [TestMethod]
         public void SelfAssignment_CSharp() =>
-            OldVerifier.VerifyAnalyzer(@"TestCases\SelfAssignment.cs",
-                new CS.SelfAssignment(),
-                ParseOptionsHelper.FromCSharp8);
+            builderCS.AddPaths("SelfAssignment.cs").WithOptions(ParseOptionsHelper.FromCSharp8).Verify();
 
 #if NET
         [TestMethod]
         public void SelfAssignment_CSharp10() =>
-            OldVerifier.VerifyAnalyzerFromCSharp10Console(@"TestCases\SelfAssignment.CSharp10.cs", new CS.SelfAssignment());
+            builderCS.AddPaths("SelfAssignment.CSharp10.cs").WithOptions(ParseOptionsHelper.FromCSharp10).WithTopLevelStatements().Verify();
 #endif
 
         [TestMethod]
         public void SelfAssignment_VisualBasic() =>
-            OldVerifier.VerifyAnalyzer(@"TestCases\SelfAssignment.vb", new VB.SelfAssignment());
+            builderVB.AddPaths("SelfAssignment.vb").Verify();
     }
 }
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.CSharp10.cs b/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.CSharp10.cs
index f5eecc79b7d..d14bd0b4bbb 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.CSharp10.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.CSharp10.cs
@@ -1,3 +1,5 @@
 int x = 42;
 
-(x, var y) = (x, 42); // FN
+  (x, var y) = (x, 42);
+// ^                    Noncompliant
+//              ^       Secondary@-1
diff --git a/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.cs b/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.cs
index e539ed5bdba..f7cd1f83a92 100644
--- a/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.cs
+++ b/analyzers/tests/SonarAnalyzer.UnitTest/TestCases/SelfAssignment.cs
@@ -17,7 +17,9 @@ public SelfAssignment(int Prop1)
         {
             int? value = null;
 
-            value ??= value; // Noncompliant
+            value ??= value;
+//          ^^^^^           Noncompliant
+//                    ^^^^^ Secondary@-1
         }
 
         public int Prop1 { get; set; }
@@ -25,13 +27,15 @@ public SelfAssignment(int Prop1)
         public void Test()
         {
             var Prop1 = 5;
-            Prop1 = Prop1; //Noncompliant
-//          ^^^^^^^^^^^^^
+            Prop1 = Prop1;
+//          ^^^^^         Noncompliant
+//                  ^^^^^ Secondary@-1
 
             Prop1 = 2*Prop1;
 
             var y = 5;
-            y = /*comment*/ y; //Noncompliant {{Remove or correct this useless self-assignment.}}
+            y = /*comment*/ y; // Noncompliant {{Remove or correct this useless self-assignment.}}
+                               // Secondary@-1
 
             var x = new SelfAssignment
             {