diff --git a/packages/pyright-internal/src/analyzer/checker.ts b/packages/pyright-internal/src/analyzer/checker.ts
index 870f2c2ef..8bc0680ac 100644
--- a/packages/pyright-internal/src/analyzer/checker.ts
+++ b/packages/pyright-internal/src/analyzer/checker.ts
@@ -6958,7 +6958,7 @@ export class Checker extends ParseTreeWalker {
                 typeVars.some((typeVar) => typeVar.scopeId === functionType.details.methodClass?.details.typeVarScopeId)
             ) {
                 this._evaluator.addDiagnostic(
-                    DiagnosticRule.reportGeneralTypeIssues,
+                    DiagnosticRule.reportInvalidTypeVarUse,
                     LocMessage.initMethodSelfParamTypeVar(),
                     paramInfo.typeAnnotation
                 );
diff --git a/packages/pyright-internal/src/tests/typeEvaluator3.test.ts b/packages/pyright-internal/src/tests/typeEvaluator3.test.ts
index ffb818fb7..c09f9f517 100644
--- a/packages/pyright-internal/src/tests/typeEvaluator3.test.ts
+++ b/packages/pyright-internal/src/tests/typeEvaluator3.test.ts
@@ -1536,7 +1536,7 @@ test('Constructor5', () => {
 test('Constructor6', () => {
     const analysisResults = TestUtils.typeAnalyzeSampleFiles(['constructor6.py']);
 
-    TestUtils.validateResults(analysisResults, 1);
+    TestUtils.validateResults(analysisResults, 0, 1);
 });
 
 test('Constructor7', () => {