Index: /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14605)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreferenceTestIT.java	(revision 14606)
@@ -81,5 +81,5 @@
     @ClassRule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public static JOSMTestRules test = new JOSMTestRules().https().preferences().projection().projectionNadGrids()
+    public static JOSMTestRules test = new JOSMTestRules().https().i18n().preferences().projection().projectionNadGrids()
                                                    .timeout((int) TimeUnit.MINUTES.toMillis(40));
 
@@ -123,5 +123,6 @@
         ImageryLayerInfo.instance.load(false);
         return ImageryLayerInfo.instance.getDefaultLayers()
-                .stream().map(x -> new Object[] {x.getId(), x})
+                .stream()
+                .map(x -> new Object[] {x.getId(), x})
                 .collect(Collectors.toList());
     }
@@ -137,8 +138,9 @@
 
     private boolean addError(ImageryInfo info, String error) {
-        return !ignoredErrors.contains(error) &&
+        String errorMsg = error.replace('\n', ' ');
+        return !ignoredErrors.contains(errorMsg) &&
                errors.computeIfAbsent(info.getCountryCode(), x -> Collections.synchronizedMap(new TreeMap<>()))
                      .computeIfAbsent(info, x -> Collections.synchronizedList(new ArrayList<>()))
-                     .add(error);
+                     .add(errorMsg);
     }
 
Index: /trunk/tools/checkstyle/josm_filters.xml
===================================================================
--- /trunk/tools/checkstyle/josm_filters.xml	(revision 14605)
+++ /trunk/tools/checkstyle/josm_filters.xml	(revision 14606)
@@ -45,4 +45,6 @@
   <suppress checks="HeaderCheck" files="MultiSplitLayout\.java" />
   <suppress checks="HeaderCheck" files="MultiSplitPane\.java" />
+  <suppress checks="HeaderCheck" files="ParallelParameterized\.java" />
+  <suppress checks="HeaderCheck" files="ParallelScheduler\.java" />
   <suppress checks="FileLengthCheck" files="DomainValidator\.java" />
   <suppress checks="org.openstreetmap.josm.TopLevelJavadocCheck" files="package-info\.java" />