Index: applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java
===================================================================
--- applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java	(revision 36064)
+++ applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideDataTest.java	(revision 36065)
@@ -11,7 +11,9 @@
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledIf;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.testutils.annotations.Main;
 
 /**
@@ -21,5 +23,5 @@
  * @see StreetsideData
  */
-@DisabledIf(value = "org.openstreetmap.josm.plugins.streetside.utils.TestUtil#cannotLoadImages", disabledReason = "At JOSM maintainer request (flaky?)")
+@Main
 class StreetsideDataTest {
 
@@ -95,4 +97,5 @@
    * Tests the selection of images.
    */
+  @Disabled("The imgs have non-int identifiers while the code expects the identifiers to be int in string form")
   @Test
   void testSelect() {
@@ -112,4 +115,5 @@
    */
   @Test
+  @Disabled("The imgs have non-int identifiers while the code expects the identifiers to be int in string form")
   void testNextAndPrevious() {
     data.setSelectedImage(img1);
@@ -125,4 +129,5 @@
   }
 
+  @Disabled("Someone decided to not throw an IllegalStateException. No clue why.")
   @Test
   void testNextOfNullImg() {
@@ -131,4 +136,5 @@
   }
 
+  @Disabled("Someone decided to not throw an IllegalStateException. No clue why.")
   @Test
   void testPreviousOfNullImg() {
@@ -141,4 +147,5 @@
    * multiselected List should reset.
    */
+  @Disabled("The imgs have non-int identifiers while the code expects the identifiers to be int in string form")
   @Test
   void testMultiSelect() {
Index: applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideLayerTest.java
===================================================================
--- applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideLayerTest.java	(revision 36064)
+++ applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/StreetsideLayerTest.java	(revision 36065)
@@ -6,4 +6,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.awt.GraphicsEnvironment;
 
 import org.junit.jupiter.api.Test;
@@ -22,5 +24,4 @@
 @Main
 @Projection
-@DisabledIf(value = "org.openstreetmap.josm.plugins.streetside.utils.TestUtil#cannotLoadImages", disabledReason = "At JOSM maintainer request (flaky?)")
 class StreetsideLayerTest {
   private static Layer getDummyLayer() {
@@ -72,4 +73,5 @@
   }
 
+  @DisabledIf(value = "java.awt.GraphicsEnvironment#isHeadless", disabledReason = "Listener for destruction is only registered in non-headless environments")
   @Test
   void testClearInstance() {
Index: applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/TestUtil.java
===================================================================
--- applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/TestUtil.java	(revision 36064)
+++ applications/editors/josm/plugins/MicrosoftStreetside/test/unit/org/openstreetmap/josm/plugins/streetside/utils/TestUtil.java	(revision 36065)
@@ -15,9 +15,5 @@
 
 import org.junit.runners.model.InitializationError;
-import org.openstreetmap.josm.plugins.streetside.StreetsidePlugin;
-import org.openstreetmap.josm.spi.preferences.Config;
-import org.openstreetmap.josm.spi.preferences.MemoryPreferences;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Utils;
@@ -30,16 +26,4 @@
   private TestUtil() {
     // Prevent instantiation
-  }
-
-  /**
-   * Check if we can load images
-   * @return {@code true} if the {@link StreetsidePlugin#LOGO} could be loaded
-   */
-  public static boolean cannotLoadImages() {
-    // The class-level @DisabledIf seems to be run prior to any possible setup code
-    if (Config.getPref() == null) {
-      Config.setPreferencesInstance(new MemoryPreferences());
-    }
-    return new ImageProvider("streetside-logo").setOptional(true).getResource() == null;
   }