diff --git a/test/registry_tests.py b/test/registry_tests.py
index cb7cf412d..dac59d9b1 100644
--- a/test/registry_tests.py
+++ b/test/registry_tests.py
@@ -440,6 +440,19 @@ class RegistryTests(RegistryTestCase):
     # org.
     self.do_pull('buynlarge', 'newrepo', 'devtable', 'password')
 
+
+  def test_push_unicode_metadata(self):
+    self.conduct_api_login('devtable', 'password')
+
+    images = [{
+      'id': 'onlyimagehere',
+      'comment': 'Pawe\xc5\x82 Kami\xc5\x84ski <pawel.kaminski@codewise.com>'.decode('utf-8')
+    }]
+
+    self.do_push('devtable', 'unicodetest', 'devtable', 'password', images)
+    self.do_pull('devtable', 'unicodetest', 'devtable', 'password')
+
+
   def test_tag_validation(self):
     image_id = 'onlyimagehere'
     images = [{