Index: trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java	(revision 18775)
+++ trunk/test/unit/org/openstreetmap/josm/actions/upload/ValidateUploadHookTest.java	(revision 18776)
@@ -6,4 +6,5 @@
 
 import java.util.Collections;
+import java.util.stream.Stream;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -12,5 +13,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.APIDataSet;
@@ -48,8 +50,18 @@
     }
 
+    static Stream<Arguments> testUploadOtherErrors() {
+        return Stream.of(
+                Arguments.of(true, true),
+                Arguments.of(true, false),
+                Arguments.of(false, false),
+                Arguments.of(false, true)
+        );
+    }
+
     @ParameterizedTest
-    @ValueSource(booleans = {true, false})
-    void testUploadOtherErrors(boolean otherEnabled) {
-        ValidatorPrefHelper.PREF_OTHER_UPLOAD.put(otherEnabled);
+    @MethodSource
+    void testUploadOtherErrors(boolean otherUploadEnabled, boolean otherEnabled) {
+        ValidatorPrefHelper.PREF_OTHER.put(otherEnabled);
+        ValidatorPrefHelper.PREF_OTHER_UPLOAD.put(otherUploadEnabled);
         final DataSet ds = new DataSet();
         final Way building = TestUtils.newWay("building=yes", new Node(new LatLon(33.2287665, -111.8259225)),
@@ -74,5 +86,5 @@
                 };
         new ValidateUploadHook().checkUpload(new APIDataSet(ds));
-        assertEquals(!otherEnabled, mocker.getInvocationLog().isEmpty());
+        assertEquals(!(otherEnabled && otherUploadEnabled), mocker.getInvocationLog().isEmpty());
     }
 }