Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java	(revision 16319)
+++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelperTest.java	(revision 16321)
@@ -51,5 +51,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().territories().rlTraffic().projection();
+    public JOSMTestRules test = new JOSMTestRules().territories().projection();
 
     private static TagEditHelper newTagEditHelper() {
Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16319)
+++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java	(revision 16321)
@@ -65,5 +65,4 @@
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.MemoryManagerTest;
-import org.openstreetmap.josm.tools.RightAndLefthandTraffic;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.bugreport.ReportedException;
@@ -100,5 +99,4 @@
     private boolean useHttps;
     private boolean territories;
-    private boolean rlTraffic;
     private boolean metric;
     private boolean main;
@@ -270,8 +268,9 @@
      * @return this instance, for easy chaining
      * @since 12556
-     */
+     * @deprecated Use {@link #territories}
+     */
+    @Deprecated
     public JOSMTestRules rlTraffic() {
         territories();
-        rlTraffic = true;
         return this;
     }
@@ -551,8 +550,4 @@
         if (territories) {
             Territories.initializeInternalData();
-        }
-
-        if (rlTraffic) {
-            RightAndLefthandTraffic.initialize();
         }
 
Index: trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
===================================================================
--- trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java	(revision 16319)
+++ trunk/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java	(revision 16321)
@@ -21,5 +21,5 @@
     @Rule
     @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules rules = new JOSMTestRules().projection().rlTraffic();
+    public JOSMTestRules rules = new JOSMTestRules().projection().territories();
 
     /**