diff --git a/product/ERP5/tests/testERP5Base.py b/product/ERP5/tests/testERP5Base.py
index da5dd2c559abca291c934f35c5aa905fa25b2e1b..e5c9b6c3bbd70e0f890b9eff2194457538d46cfc 100644
--- a/product/ERP5/tests/testERP5Base.py
+++ b/product/ERP5/tests/testERP5Base.py
@@ -1202,6 +1202,28 @@ class TestERP5Base(ERP5TypeTestCase):
     self.assertEquals('\xff', image_data[0])
     self.assertEquals('\xd8', image_data[1])
   
+  def test_ConvertImageQuality(self):
+    image = self.portal.newContent(portal_type='Image', id='test_image')
+    image.edit(file=self.makeImageFileUpload('erp5_logo.png'))
+    image_type, image_data = image.convert('jpg', display='thumbnail',
+                                           quality=100)
+    self.assertEquals('image/jpeg', image_type)
+    # magic
+    self.assertEquals('\xff', image_data[0])
+    self.assertEquals('\xd8', image_data[1])
+  
+  def test_ConvertImagePdata(self):
+    image = self.portal.newContent(portal_type='Image', id='test_image')
+    image.edit(file=self.makeImageFileUpload('erp5_logo.bmp'))
+    from OFS.Image import Pdata
+    self.assertTrue(isinstance(image.data, Pdata))
+
+    image_type, image_data = image.convert('jpg', display='thumbnail')
+    self.assertEquals('image/jpeg', image_type)
+    # magic
+    self.assertEquals('\xff', image_data[0])
+    self.assertEquals('\xd8', image_data[1])
+
   def test_ImageSize(self):
     image = self.portal.newContent(portal_type='Image', id='test_image')
     image.edit(file=self.makeImageFileUpload('erp5_logo.png'))
diff --git a/product/ERP5/tests/test_data/images/erp5_logo.bmp b/product/ERP5/tests/test_data/images/erp5_logo.bmp
new file mode 100644
index 0000000000000000000000000000000000000000..42fbbdf1aacdef2f297ffda45e4432a54655713b
Binary files /dev/null and b/product/ERP5/tests/test_data/images/erp5_logo.bmp differ