Index: trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 16161)
+++ trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 16162)
@@ -60,5 +60,4 @@
 import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
-import com.google.common.io.ByteStreams;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -531,6 +530,6 @@
             ) {
                 assertArrayEquals(
-                    ByteStreams.toByteArray(streamA),
-                    ByteStreams.toByteArray(streamB)
+                    Utils.readBytesFromStream(streamA),
+                    Utils.readBytesFromStream(streamB)
                 );
             }
Index: trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java	(revision 16161)
+++ trunk/test/unit/org/openstreetmap/josm/actions/downloadtasks/PluginDownloadTaskTest.java	(revision 16162)
@@ -20,6 +20,5 @@
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
-
-import com.google.common.io.ByteStreams;
+import org.openstreetmap.josm.tools.Utils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -141,5 +140,5 @@
             assertArrayEquals(
                 existingPluginContents,
-                ByteStreams.toByteArray(pluginDirPluginStream)
+                Utils.readBytesFromStream(pluginDirPluginStream)
             );
         }