diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java
index ff5af422ba0..84b77b9c6bd 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunAllTestsCodeLensSupplier.java
@@ -133,9 +133,9 @@ public Class<DefaultCodeLensData> getCodeLensDataClass() {
     return DefaultCodeLensData.class;
   }
 
-  private static CodeLens toCodeLens(MethodSymbol method, DocumentContext documentContext) {
+  private CodeLens toCodeLens(MethodSymbol method, DocumentContext documentContext) {
 
-    var codeLensData = new DefaultCodeLensData(documentContext.getUri(), COMMAND_ID);
+    var codeLensData = new DefaultCodeLensData(documentContext.getUri(), getId());
 
     var codeLens = new CodeLens(method.getSubNameRange());
     codeLens.setData(codeLensData);
diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java
index ec0fd8f91d6..0960c030f7f 100644
--- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java
+++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/codelenses/RunTestCodeLensSupplier.java
@@ -145,7 +145,7 @@ public CodeLens resolve(DocumentContext documentContext, CodeLens unresolved, Ru
 
   private CodeLens toCodeLens(MethodSymbol method, DocumentContext documentContext) {
     var testId = method.getName();
-    var codeLensData = new RunTestCodeLensData(documentContext.getUri(), COMMAND_ID, testId);
+    var codeLensData = new RunTestCodeLensData(documentContext.getUri(), getId(), testId);
 
     var codeLens = new CodeLens(method.getSubNameRange());
     codeLens.setData(codeLensData);