diff --git a/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties b/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
index 96d73a9ba2b96fc1772ca68deea9151f36d08908..e7bd9e04c9b9efd7f46ab73ab7577d263f275165 100644
--- a/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
+++ b/src/share/classes/sun/util/resources/sv/LocaleNames_sv.properties
@@ -1106,7 +1106,7 @@ WF=Wallis och Futuna
 WS=Samoa
 YE=Jemen
 YT=Mayotte
-ZA=Sydafrika 
+ZA=Sydafrika
 ZM=Zambia
 ZW=Zimbabwe
 
diff --git a/test/sun/text/resources/LocaleData b/test/sun/text/resources/LocaleData
index 8dfe01ed0d4a5c2b19e38ec4f4f202b811ba6821..1fd2076a11428ce3c86bfd87f5e45c9896aba11b 100644
--- a/test/sun/text/resources/LocaleData
+++ b/test/sun/text/resources/LocaleData
@@ -7684,3 +7684,6 @@ CurrencyNames/lv_LV/EUR=\u20AC
 
 # bug # 6192407
 LocaleNames/ko/PT=\ud3ec\ub974\ud22c\uce7c
+
+# bug 6931564
+LocaleNames/sv/ZA=Sydafrika
diff --git a/test/sun/text/resources/LocaleDataTest.java b/test/sun/text/resources/LocaleDataTest.java
index 130f48b031f2868c95640f6480ae74a041403ece..8918f1a15132b07dab7384ab7040a2b6d3a4e4b4 100644
--- a/test/sun/text/resources/LocaleDataTest.java
+++ b/test/sun/text/resources/LocaleDataTest.java
@@ -35,7 +35,7 @@
  *      6645405 6650730 6910489 6573250 6870908 6585666 6716626 6914413 6916787
  *      6919624 6998391 7019267 7020960 7025837 7020583 7036905 7066203 7101495
  *      7003124 7085757 7028073 7171028 7189611 8000983 7195759 8004489 8006509
- *      7114053 7074882 7040556 8013836 8021121 6192407
+ *      7114053 7074882 7040556 8013836 8021121 6192407 6931564
  * @summary Verify locale data
  *
  */