Index: trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java	(revision 14092)
+++ trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTestIT.java	(revision 14093)
@@ -16,6 +16,5 @@
 import java.util.stream.Collectors;
 
-import org.apache.commons.collections.MapUtils;
-import org.apache.commons.lang.exception.ExceptionUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.junit.Rule;
 import org.junit.Test;
@@ -72,11 +71,18 @@
         }
 
-        MapUtils.debugPrint(System.out, null, invalidManifestEntries);
-        MapUtils.debugPrint(System.out, null, loadingExceptions);
-        MapUtils.debugPrint(System.out, null, layerExceptions);
+        debugPrint(invalidManifestEntries);
+        debugPrint(loadingExceptions);
+        debugPrint(layerExceptions);
         String msg = Arrays.toString(invalidManifestEntries.entrySet().toArray()) + '\n' +
                      Arrays.toString(loadingExceptions.entrySet().toArray()) + '\n' +
                      Arrays.toString(layerExceptions.entrySet().toArray());
         assertTrue(msg, invalidManifestEntries.isEmpty() && loadingExceptions.isEmpty() && layerExceptions.isEmpty());
+    }
+
+    private static void debugPrint(Map<String, ?> invalidManifestEntries) {
+        System.out.println(invalidManifestEntries.entrySet()
+                .stream()
+                .map(e -> e.getKey() + "=\"" + e.getValue() + "\"")
+                .collect(Collectors.joining(", ")));
     }
 
Index: trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java	(revision 14092)
+++ trunk/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java	(revision 14093)
@@ -1,4 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.tools.template_engine;
+
+import static org.junit.Assert.assertEquals;
 
 import java.util.Arrays;
@@ -16,5 +18,4 @@
 import org.openstreetmap.josm.data.osm.search.SearchParseError;
 import org.openstreetmap.josm.testutils.DatasetFactory;
-import org.unitils.reflectionassert.ReflectionAssert;
 
 /**
@@ -38,5 +39,5 @@
     public void testEmpty() throws ParseError {
         TemplateParser parser = new TemplateParser("");
-        ReflectionAssert.assertReflectionEquals(new StaticText(""), parser.parse());
+        assertEquals(new StaticText(""), parser.parse());
     }
 
@@ -48,5 +49,5 @@
     public void testVariable() throws ParseError {
         TemplateParser parser = new TemplateParser("abc{var}\\{ef\\$\\{g");
-        ReflectionAssert.assertReflectionEquals(CompoundTemplateEntry.fromArray(new StaticText("abc"),
+        assertEquals(CompoundTemplateEntry.fromArray(new StaticText("abc"),
                 new Variable("var"), new StaticText("{ef${g")), parser.parse());
     }
@@ -63,5 +64,5 @@
             new Variable("name"),
             new Variable("desc")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        assertEquals(condition, parser.parse());
     }
 
@@ -77,5 +78,5 @@
                 new Variable("name"),
                 new Variable("desc")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        assertEquals(condition, parser.parse());
     }
 
@@ -96,5 +97,6 @@
                 new SearchExpressionCondition(compile("admin_level = 4"), new StaticText("NUTS 2")),
                 new Variable("admin_level")));
-        ReflectionAssert.assertReflectionEquals(condition, parser.parse());
+        TemplateEntry parse = parser.parse();
+        assertEquals(condition, parse);
     }