Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 18341)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManagerTest.java	(revision 18344)
@@ -14,4 +14,5 @@
 import javax.swing.JDialog;
 
+import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -33,5 +34,4 @@
 import mockit.Mock;
 import mockit.MockUp;
-import org.junit.jupiter.api.Test;
 
 /**
@@ -137,5 +137,5 @@
         }
 
-        DownloadSelectedChangesetContentAction action = new DownloadSelectedChangesetContentAction(ChangesetCacheManager.buildModel());
+        DownloadSelectedChangesetContentAction action = new DownloadSelectedChangesetContentAction(buildModel());
         action.valueChanged(null);
         action.actionPerformed(new ActionEvent(new JDialog().getComponent(0), ActionEvent.ACTION_PERFORMED, "foo"));
@@ -153,5 +153,5 @@
         }
 
-        DownloadSelectedChangesetsAction action = new DownloadSelectedChangesetsAction(ChangesetCacheManager.buildModel());
+        DownloadSelectedChangesetsAction action = new DownloadSelectedChangesetsAction(buildModel());
         action.valueChanged(null);
         action.actionPerformed(new ActionEvent(new JDialog().getComponent(0), ActionEvent.ACTION_PERFORMED, "foo"));
@@ -208,5 +208,5 @@
     @Test
     void testRemoveFromCacheAction() {
-        RemoveFromCacheAction action = new RemoveFromCacheAction(ChangesetCacheManager.buildModel());
+        RemoveFromCacheAction action = new RemoveFromCacheAction(buildModel());
         action.valueChanged(null);
         action.actionPerformed(null);
@@ -218,5 +218,11 @@
     @Test
     void testShowDetailAction() {
-        new ShowDetailAction(ChangesetCacheManager.buildModel()).actionPerformed(null);
+        new ShowDetailAction(buildModel()).actionPerformed(null);
+    }
+
+    private static ChangesetCacheManagerModel buildModel() {
+        ChangesetCacheManagerModel model = ChangesetCacheManager.buildModel();
+        model.setChangesetCacheTableRowSorter(new ChangesetCacheTableRowSorter(model));
+        return model;
     }
 }