diff --git a/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt b/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
index 75da9d860667..7b40a39bcd30 100644
--- a/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
+++ b/platform/configuration-store-impl/testSrc/DoNotSaveDefaults.kt
@@ -64,8 +64,6 @@ internal class DoNotSaveDefaultsTest {
   }
 
   private suspend fun doTest(componentManager: ComponentManagerImpl) {
-    val useModCountOldValue = System.getProperty("store.save.use.modificationCount")
-
     // wake up (edt, some configurables want read action)
     withContext(AppUIExecutor.onUiThread().coroutineDispatchingContext()) {
       val picoContainer = componentManager.picoContainer
@@ -90,8 +88,8 @@ internal class DoNotSaveDefaultsTest {
     propertyComponent.unsetValue("CommitChangeListDialog.DETAILS_SPLITTER_PROPORTION_2")
     propertyComponent.unsetValue("ts.lib.d.ts.version")
     propertyComponent.unsetValue("nodejs_interpreter_path.stuck_in_default_project")
-    propertyComponent.unsetValue("tasks.pass.word.conversion.enforced")
 
+    val useModCountOldValue = System.getProperty("store.save.use.modificationCount")
     try {
       System.setProperty("store.save.use.modificationCount", "false")
       componentManager.stateStore.save(isForceSavingAllSettings = true)
diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/PasswordConversionEnforcer.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/PasswordConversionEnforcer.java
index fc274cc2cf1d..762fd5cf3ec5 100644
--- a/plugins/tasks/tasks-core/src/com/intellij/tasks/config/PasswordConversionEnforcer.java
+++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/config/PasswordConversionEnforcer.java
@@ -3,12 +3,17 @@ package com.intellij.tasks.config;
 
 import com.intellij.ide.ApplicationInitializedListener;
 import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.application.ApplicationManager;
 
-public class PasswordConversionEnforcer implements ApplicationInitializedListener {
+final class PasswordConversionEnforcer implements ApplicationInitializedListener {
   private static final String ENFORCED = "tasks.pass.word.conversion.enforced";
 
   @Override
   public void componentsInitialized() {
+    if (ApplicationManager.getApplication().isUnitTestMode()) {
+      return;
+    }
+
     if (!PropertiesComponent.getInstance().isValueSet(ENFORCED)) {
       RecentTaskRepositories.getInstance().getState();
       PropertiesComponent.getInstance().setValue(ENFORCED, true);