Index: trunk/test/unit/org/openstreetmap/josm/data/vector/VectorDataSetTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/vector/VectorDataSetTest.java	(revision 18475)
+++ trunk/test/unit/org/openstreetmap/josm/data/vector/VectorDataSetTest.java	(revision 18477)
@@ -1,4 +1,13 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
 
 import org.awaitility.Awaitility;
@@ -14,13 +23,4 @@
 import org.openstreetmap.josm.gui.layer.imagery.MVTLayer;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashSet;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 /**
Index: trunk/test/unit/org/openstreetmap/josm/data/vector/VectorNodeTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/data/vector/VectorNodeTest.java	(revision 18475)
+++ trunk/test/unit/org/openstreetmap/josm/data/vector/VectorNodeTest.java	(revision 18477)
@@ -1,4 +1,15 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.vector;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 import org.junit.jupiter.api.Test;
@@ -15,15 +26,4 @@
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.jupiter.api.Assertions.fail;
 
 /**
@@ -144,8 +144,10 @@
         assertSame(way, node.getReferrers(true).get(0));
         // No dataset yet
+        assertTrue(node.isReferredByWays(1));
+        VectorDataSet dataSet = new VectorDataSet();
+        dataSet.addPrimitive(node);
+        // Way is not yet in dataset
         assertFalse(node.isReferredByWays(1));
-        VectorDataSet dataSet = new VectorDataSet();
         dataSet.addPrimitive(way);
-        dataSet.addPrimitive(node);
         assertTrue(node.isReferredByWays(1));
         assertFalse(node.isReferredByWays(2));