Index: /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java	(revision 16599)
+++ /trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java	(revision 16600)
@@ -9,4 +9,6 @@
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.josm.gui.util.TableHelper;
 
 /**
@@ -51,11 +53,12 @@
         preventRecursion = true;
         DefaultListSelectionModel referenceModel = (DefaultListSelectionModel) e.getSource();
-        int i = referenceModel.getMinSelectionIndex();
-        int j = referenceModel.getMaxSelectionIndex();
         for (ListSelectionModel model : participants) {
             if (model == e.getSource()) {
                 continue;
             }
-            model.setSelectionInterval(i, j);
+            model.clearSelection();
+            for (int i : TableHelper.getSelectedIndices(referenceModel)) {
+                model.addSelectionInterval(i, i);
+            }
         }
         preventRecursion = false;
Index: /trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java	(revision 16599)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/TerritoriesTestIT.java	(revision 16600)
@@ -9,4 +9,5 @@
 import org.junit.Rule;
 import org.junit.Test;
+import org.openstreetmap.hot.sds.SeparateDataStorePlugin;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
@@ -23,5 +24,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules rules = new JOSMTestRules().projection();
+    public JOSMTestRules rules = new JOSMTestRules().projection().main();
 
 
@@ -31,4 +32,5 @@
     @Test
     public void testUtilityClass() {
+        new SeparateDataStorePlugin(null);
         Logging.clearLastErrorAndWarnings();
         Territories.initialize();