diff --git a/mail_attach_existing_attachment/README.rst b/mail_attach_existing_attachment/README.rst
index a3eea1475..b51893df8 100644
--- a/mail_attach_existing_attachment/README.rst
+++ b/mail_attach_existing_attachment/README.rst
@@ -31,7 +31,7 @@ To configure this module, you need to:
 
 .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
    :alt: Try me on Runbot
-   :target: https://runbot.odoo-community.org/runbot/205/10.0
+   :target: https://runbot.odoo-community.org/runbot/205/11.0
 
 Known issues / Roadmap
 ======================
diff --git a/mail_attach_existing_attachment/__init__.py b/mail_attach_existing_attachment/__init__.py
index 02baef47b..40272379f 100644
--- a/mail_attach_existing_attachment/__init__.py
+++ b/mail_attach_existing_attachment/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import wizard
diff --git a/mail_attach_existing_attachment/__manifest__.py b/mail_attach_existing_attachment/__manifest__.py
index fbc2b424a..901835c2d 100644
--- a/mail_attach_existing_attachment/__manifest__.py
+++ b/mail_attach_existing_attachment/__manifest__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #     This file is part of mail_attach_existing_attachment,
@@ -31,7 +30,7 @@
               "Odoo Community Association (OCA)",
     'website': "http://acsone.eu",
     'category': 'Social Network',
-    'version': '10.0.1.0.0',
+    'version': '11.0.1.0.0',
     'license': 'AGPL-3',
     'depends': [
         'mail',
diff --git a/mail_attach_existing_attachment/tests/__init__.py b/mail_attach_existing_attachment/tests/__init__.py
index 26c2cf040..fc1e8e4e2 100644
--- a/mail_attach_existing_attachment/tests/__init__.py
+++ b/mail_attach_existing_attachment/tests/__init__.py
@@ -1,3 +1,2 @@
-# -*- coding: utf-8 -*-
 
 from . import test_mail_attach_existing_attachment
diff --git a/mail_attach_existing_attachment/tests/test_mail_attach_existing_attachment.py b/mail_attach_existing_attachment/tests/test_mail_attach_existing_attachment.py
index af1aaaec9..4ffae5891 100644
--- a/mail_attach_existing_attachment/tests/test_mail_attach_existing_attachment.py
+++ b/mail_attach_existing_attachment/tests/test_mail_attach_existing_attachment.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #     This file is part of mail_attach_existing_attachment,
@@ -23,7 +22,7 @@
 #
 ##############################################################################
 
-from openerp.tests import common
+from odoo.tests import common
 
 
 class TestAttachExistingAttachment(common.TransactionCase):
@@ -31,7 +30,13 @@ class TestAttachExistingAttachment(common.TransactionCase):
     def setUp(self):
         super(TestAttachExistingAttachment, self).setUp()
         self.partner_obj = self.env['res.partner']
-        self.partner_01 = self.env.ref('base.res_partner_1')
+        # self.partner_01 = self.env.ref('base.res_partner_1')
+        self.partner_01 = self.env['res.partner'].create({
+            'name': 'Partner 1',
+            'email': 'partner1@example.org',
+            'is_company': True,
+            'parent_id': False,
+        })
 
     def test_send_email_attachment(self):
         attach1 = self.env['ir.attachment'].create({
diff --git a/mail_attach_existing_attachment/wizard/__init__.py b/mail_attach_existing_attachment/wizard/__init__.py
index 12ddb2dc7..b528d997d 100644
--- a/mail_attach_existing_attachment/wizard/__init__.py
+++ b/mail_attach_existing_attachment/wizard/__init__.py
@@ -1,2 +1 @@
-# -*- coding: utf-8 -*-
 from . import mail_compose_message
diff --git a/mail_attach_existing_attachment/wizard/mail_compose_message.py b/mail_attach_existing_attachment/wizard/mail_compose_message.py
index a86e4a802..073c7da0e 100644
--- a/mail_attach_existing_attachment/wizard/mail_compose_message.py
+++ b/mail_attach_existing_attachment/wizard/mail_compose_message.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 ##############################################################################
 #
 #     This file is part of mail_attach_existing_attachment,