diff --git a/lib/twine/formatters/android.rb b/lib/twine/formatters/android.rb
index caddec8..439affc 100644
--- a/lib/twine/formatters/android.rb
+++ b/lib/twine/formatters/android.rb
@@ -11,7 +11,6 @@ module Twine
         'zh-rCN' => 'zh-Hans',
         'zh-rHK' => 'zh-Hant',
         'en-rGB' => 'en-UK',
-        'zh' => 'zh-Hans',
         'in' => 'id',
         'nb' => 'no'
         # TODO: spanish
diff --git a/test/test_formatters.rb b/test/test_formatters.rb
index 574cbec..851d514 100644
--- a/test/test_formatters.rb
+++ b/test/test_formatters.rb
@@ -122,7 +122,16 @@ class TestAndroidFormatter < FormatterTest
   end
 
   def test_output_path_language_mappings
-    assert_equal 'values-zh-rCN', @formatter.output_path_for_language('zh-Hans')
+    mappings = {
+      'zh-Hans' => 'zh-rCN',
+      'zh-Hant' => 'zh-rHK',
+      'en-UK' => 'en-rGB',
+      'id' => 'in',
+      'no' => 'nb'
+    }
+    mappings.each do |lang, output_path|
+      assert_equal "values-#{output_path}", @formatter.output_path_for_language(lang)
+    end
   end
 end