Index: trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/data/BoundariesTestIT.java	(revision 19223)
@@ -17,4 +17,6 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 
 /**
@@ -22,4 +24,6 @@
  */
 @BasicPreferences
+@FunctionalTest
+@IntegrationTest
 class BoundariesTestIT {
 
Index: trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/data/imagery/ImageryCompareTestIT.java	(revision 19223)
@@ -10,4 +10,6 @@
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 import org.openstreetmap.josm.tools.HttpClient;
 
@@ -17,4 +19,6 @@
  */
 @BasicPreferences
+@FunctionalTest
+@IntegrationTest
 @Timeout(60)
 class ImageryCompareTestIT {
Index: trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/data/osm/TaginfoTestIT.java	(revision 19223)
@@ -18,4 +18,5 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.HttpClient;
@@ -30,4 +31,5 @@
  */
 @BasicPreferences
+@FunctionalTest
 @Timeout(20)
 @Territories
Index: trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 19223)
@@ -8,8 +8,10 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 
 /**
  * Tests the {@link GettingStarted} class.
  */
+@FunctionalTest
 class GettingStartedTest {
     /**
Index: trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/gui/mappaint/MapCSSRendererTest.java	(revision 19223)
@@ -34,4 +34,5 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.tools.Utils;
@@ -44,4 +45,5 @@
  */
 @BasicPreferences
+@FunctionalTest
 @Projection
 public class MapCSSRendererTest {
Index: trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/gui/mappaint/StyleCacheTest.java	(revision 19223)
@@ -32,4 +32,5 @@
 import org.openstreetmap.josm.io.OsmReader;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
@@ -40,4 +41,5 @@
  */
 @BasicPreferences
+@FunctionalTest
 @Main
 @org.openstreetmap.josm.testutils.annotations.MapPaintStyles
Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 19223)
@@ -49,4 +49,5 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.TestUser;
 import org.openstreetmap.josm.tools.Logging;
@@ -57,4 +58,5 @@
  * Unit tests of {@link MultiFetchServerObjectReader}.
  */
+@FunctionalTest
 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
 @Timeout(value = 1, unit = TimeUnit.MINUTES)
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 19223)
@@ -42,4 +42,5 @@
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.TestUser;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
@@ -52,4 +53,5 @@
  * @since 1806
  */
+@FunctionalTest
 @SuppressFBWarnings(value = "CRLF_INJECTION_LOGS")
 @org.openstreetmap.josm.testutils.annotations.OsmApi(org.openstreetmap.josm.testutils.annotations.OsmApi.APIType.DEV)
Index: trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/io/UploadStrategySelectionPanelTest.java	(revision 19223)
@@ -15,6 +15,8 @@
 import org.openstreetmap.josm.gui.io.UploadStrategySelectionPanel;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.tools.Logging;
 
+@FunctionalTest
 @Disabled
 class UploadStrategySelectionPanelTest extends JFrame {
Index: trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java	(revision 19223)
@@ -50,4 +50,5 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 import org.openstreetmap.josm.testutils.annotations.BasicWiremock;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.openstreetmap.josm.testutils.annotations.HTTP;
 import org.openstreetmap.josm.tools.HttpClient.Response;
@@ -65,4 +66,5 @@
 @BasicWiremock
 @BasicPreferences
+@FunctionalTest
 @Timeout(15)
 class HttpClientTest {
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTest.java	(revision 19223)
@@ -35,4 +35,5 @@
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.tagging.presets.items.Key;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 import org.xml.sax.SAXException;
 
@@ -43,4 +44,5 @@
  * Unit tests of {@link ImageProvider} class.
  */
+@FunctionalTest
 class ImageProviderTest {
     private static final class LogHandler14319 extends Handler {
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestIT.java	(revision 19223)
@@ -5,8 +5,12 @@
 
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
+import org.openstreetmap.josm.testutils.annotations.IntegrationTest;
 
 /**
  * Integration tests of {@link ImageProvider} class.
  */
+@FunctionalTest
+@IntegrationTest
 class ImageProviderTestIT {
     /**
Index: trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java	(revision 19221)
+++ trunk/test/functional/org/openstreetmap/josm/tools/ImageProviderTestManual.java	(revision 19223)
@@ -13,8 +13,10 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
+import org.openstreetmap.josm.testutils.annotations.FunctionalTest;
 
 /**
  * Unit tests of {@link ImageProvider} class for manual execution.
  */
+@FunctionalTest
 class ImageProviderTestManual {
     /**