1 files changed, 2 insertions, 11 deletions
diff --git a/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java b/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java
index 240403e..4ed89de 100644
--- a/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java
+++ b/luni/src/test/java/libcore/java/util/OldTimeZoneTest.java
@@ -83,6 +83,7 @@ public class OldTimeZoneTest extends TestCase {
     }
 
     public void test_getDisplayName() {
+        Locale.setDefault(Locale.US);
         TimeZone tz = TimeZone.getTimeZone("GMT-6");
         assertEquals("GMT-06:00", tz.getDisplayName());
         tz = TimeZone.getTimeZone("America/Los_Angeles");
@@ -99,6 +100,7 @@ public class OldTimeZoneTest extends TestCase {
     }
 
     public void test_getDisplayNameZI() {
+        Locale.setDefault(Locale.US);
         TimeZone tz = TimeZone.getTimeZone("America/Los_Angeles");
         assertEquals("PST",                   tz.getDisplayName(false, 0));
         assertEquals("Pacific Daylight Time", tz.getDisplayName(true, 1));
@@ -150,15 +152,4 @@ public class OldTimeZoneTest extends TestCase {
         tz.setID("New ID for GMT-6");
         assertEquals("New ID for GMT-6", tz.getID());
     }
-
-    Locale loc = null;
-
-    protected void setUp() {
-        loc = Locale.getDefault();
-        Locale.setDefault(Locale.US);
-    }
-
-    protected void tearDown() {
-        Locale.setDefault(loc);
-    }
 }