diff --git a/platform/core-impl/src/com/intellij/ide/plugins/ClassPathXmlPathResolver.kt b/platform/core-impl/src/com/intellij/ide/plugins/ClassPathXmlPathResolver.kt
index 40184c697a59..bf507f6dca13 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/ClassPathXmlPathResolver.kt
+++ b/platform/core-impl/src/com/intellij/ide/plugins/ClassPathXmlPathResolver.kt
@@ -62,7 +62,7 @@ internal class ClassPathXmlPathResolver(private val classLoader: ClassLoader, va
 
       if (isRunningFromSources && path.startsWith("intellij.") && dataLoader.emptyDescriptorIfCannotResolve) {
         Logger.getInstance(ClassPathXmlPathResolver::class.java)
-          .warn("Cannot resolve $path (dataLoader=$dataLoader, classLoader=$classLoader). ")
+          .trace("Cannot resolve $path (dataLoader=$dataLoader, classLoader=$classLoader). ")
         val descriptor = RawPluginDescriptor()
         descriptor.`package` = "unresolved.${path.removeSuffix(".xml")}"
         return descriptor
diff --git a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
index 6460c329823e..6eee445065f3 100644
--- a/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/PluginManagerCore.java
@@ -454,7 +454,9 @@ public final class PluginManagerCore {
                         ).collect(Collectors.joining("\n  "));
 
     if (isUnitTestMode || !GraphicsEnvironment.isHeadless()) {
-      getLogger().warn(logMessage);
+      if (!isUnitTestMode) {
+        getLogger().warn(logMessage);
+      }
       return Stream.concat(
           globalErrors.stream(),
           loadingErrors.stream()
@@ -585,7 +587,7 @@ public final class PluginManagerCore {
 
   private static void disableIncompatiblePlugins(@NotNull Collection<IdeaPluginDescriptorImpl> descriptors,
                                                  @NotNull Map<PluginId, IdeaPluginDescriptorImpl> idMap,
-                                                 @NotNull Map<PluginId, PluginLoadingError> errors) {
+                                                 @NotNull Map<? super PluginId, ? super PluginLoadingError> errors) {
     String selectedIds = System.getProperty("idea.load.plugins.id");
     String selectedCategory = System.getProperty("idea.load.plugins.category");