diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index bdd733699323..2d846bb5d1b5 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -440,7 +440,7 @@
 
   <completion.skip implementation="com.intellij.codeInsight.template.impl.LiveTemplateCompletionContributor$Skipper" id="skipLiveTemplate"/>
 
-  <completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" order="first, before liveTemplates"/>
+  <completion.contributor language="TEXT" implementationClass="com.intellij.openapi.vcs.CommitCompletionContributor" id="commitCompletion" order="first, before liveTemplates"/>
 
   <applicationService serviceInterface="com.intellij.execution.console.ConsoleFoldingSettings" serviceImplementation="com.intellij.execution.console.ConsoleFoldingSettings"/>
   <console.folding implementation="com.intellij.execution.console.SubstringConsoleFolding"/>
diff --git a/plugins/tasks/tasks-core/src/META-INF/plugin.xml b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
index 3a2d98433276..f038f640e5eb 100644
--- a/plugins/tasks/tasks-core/src/META-INF/plugin.xml
+++ b/plugins/tasks/tasks-core/src/META-INF/plugin.xml
@@ -87,7 +87,7 @@
 
     <editChangelistSupport implementation="com.intellij.tasks.impl.TaskChangelistSupport"/>
 
-    <completion.contributor language="TEXT" implementationClass="com.intellij.tasks.impl.TaskCompletionContributor"/>
+    <completion.contributor language="TEXT" implementationClass="com.intellij.tasks.impl.TaskCompletionContributor" order="first, before commitCompletion"/>
 
     <projectService serviceInterface="com.intellij.tasks.impl.TaskProjectConfiguration"
                     serviceImplementation="com.intellij.tasks.impl.TaskProjectConfiguration"/>
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java
index cd8832739570..1d8ea494f704 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/impl/TaskCompletionContributor.java
@@ -16,6 +16,7 @@ import com.intellij.psi.PsiFile;
 import com.intellij.tasks.Task;
 import com.intellij.tasks.actions.TaskSearchSupport;
 import com.intellij.util.Consumer;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -30,7 +31,7 @@ public class TaskCompletionContributor extends CompletionContributor {
   private static final Key<Consumer<Task>> KEY = Key.create("task completion available");
   private static final Key<Boolean> AUTO_POPUP_KEY = Key.create("task completion auto-popup");
 
-  public static void installCompletion(Document document, Project project, Consumer<Task> consumer, boolean autoPopup) {
+  public static void installCompletion(Document document, Project project, @Nullable Consumer<Task> consumer, boolean autoPopup) {
     PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document);
     if (psiFile != null) {
       //noinspection unchecked
diff --git a/plugins/tasks/tasks-tests/tasks-tests.iml b/plugins/tasks/tasks-tests/tasks-tests.iml
index 992f3bcf0491..a9e1beff04c1 100644
--- a/plugins/tasks/tasks-tests/tasks-tests.iml
+++ b/plugins/tasks/tasks-tests/tasks-tests.iml
@@ -13,6 +13,8 @@
     <orderEntry type="module" module-name="jira-connector" />
     <orderEntry type="library" scope="TEST" name="JUnit4" level="project" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
+    <orderEntry type="module" module-name="vcs-impl" />
+    <orderEntry type="module" module-name="idea" />
   </component>
 </module>
 
diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
index ffad6a19a5ff..3af2d7c7b5c1 100644
--- a/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
+++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/TaskCompletionTest.java
@@ -2,10 +2,13 @@ package com.intellij.tasks;
 
 import com.intellij.codeInsight.completion.CompletionType;
 import com.intellij.codeInsight.lookup.LookupElement;
+import com.intellij.openapi.editor.Document;
+import com.intellij.openapi.vcs.ui.CommitMessage;
 import com.intellij.psi.PsiFile;
 import com.intellij.tasks.impl.LocalTaskImpl;
 import com.intellij.tasks.impl.TaskCompletionContributor;
 import com.intellij.tasks.impl.TaskManagerImpl;
+import com.intellij.testFramework.MapDataContext;
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 
 import java.util.Arrays;
@@ -55,7 +58,10 @@ public class TaskCompletionTest extends LightCodeInsightFixtureTestCase {
 
   private void configureFile(String text) {
     PsiFile psiFile = myFixture.configureByText("test.txt", text);
-    TaskCompletionContributor.installCompletion(myFixture.getDocument(psiFile), getProject(), null, false);
+    Document document = myFixture.getDocument(psiFile);
+    TaskCompletionContributor.installCompletion(document, getProject(), null, false);
+    document.putUserData(CommitMessage.DATA_CONTEXT_KEY, new MapDataContext());
+
   }
 
   private void configureRepository(LocalTaskImpl... tasks) {