Index: trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 18207)
+++ trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java	(revision 18208)
@@ -37,4 +37,5 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.Utils;
 import org.openstreetmap.josm.tools.date.DateUtils;
 
@@ -122,5 +123,5 @@
         pref.init(false);
         String url = OsmApi.getOsmApi().getServerUrl();
-        if (url == null || url.isEmpty() || isProductionApiUrl(url)) {
+        if (Utils.isEmpty(url) || isProductionApiUrl(url)) {
             Config.getPref().put("osm-server.url", "https://api06.dev.openstreetmap.org/api");
         }
Index: trunk/test/unit/org/openstreetmap/josm/TestUtils.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 18207)
+++ trunk/test/unit/org/openstreetmap/josm/TestUtils.java	(revision 18208)
@@ -86,5 +86,5 @@
     public static String getTestDataRoot() {
         String testDataRoot = System.getProperty("josm.test.data");
-        if (testDataRoot == null || testDataRoot.isEmpty()) {
+        if (Utils.isEmpty(testDataRoot)) {
             testDataRoot = "test/data";
             System.out.println("System property josm.test.data is not set, using '" + testDataRoot + "'");