diff --git a/l10n_ch_import_camt054/__manifest__.py b/l10n_ch_import_camt054/__manifest__.py
index ca34c10e3..81d7a16d7 100644
--- a/l10n_ch_import_camt054/__manifest__.py
+++ b/l10n_ch_import_camt054/__manifest__.py
@@ -15,10 +15,7 @@
         'views/account_bank_statement_line_test.xml',
     ],
     'demo': [
-
-    ],
-    'test': [
-        'res/test_data.yml',
+        'demo/test_data.yml',
     ],
     'installable': True,
 }
diff --git a/l10n_ch_import_camt054/res/test_data.yml b/l10n_ch_import_camt054/demo/test_data.yml
similarity index 100%
rename from l10n_ch_import_camt054/res/test_data.yml
rename to l10n_ch_import_camt054/demo/test_data.yml
diff --git a/l10n_ch_import_camt054/res/camt.054.demo-1000.xml b/l10n_ch_import_camt054/res/camt.054.demo-1000.xml
index 8b24a8e46..3f063add5 100644
--- a/l10n_ch_import_camt054/res/camt.054.demo-1000.xml
+++ b/l10n_ch_import_camt054/res/camt.054.demo-1000.xml
@@ -134,7 +134,7 @@
             </RltdDts>
           </TxDtls>
         </NtryDtls>
-        <AddtlNtryInf>Demo 2</AddtlNtryInf>
+        <AddtlNtryInf>Demo Camt054</AddtlNtryInf>
       </Ntry>
     </Ntfctn>
   </BkToCstmrDbtCdtNtfctn>
diff --git a/l10n_ch_import_camt054/tests/test_import_camt.py b/l10n_ch_import_camt054/tests/test_import_camt.py
index a8e1d31bc..d42db5fae 100644
--- a/l10n_ch_import_camt054/tests/test_import_camt.py
+++ b/l10n_ch_import_camt054/tests/test_import_camt.py
@@ -1,23 +1,24 @@
 # -*- coding: utf-8 -*-
 import base64
 
-from odoo.tests import TransactionCase
+from odoo.tests import SingleTransactionCase
 from odoo.modules import get_module_resource
 
 
-class TestImportCamt(TransactionCase):
+class TestImportCamt(SingleTransactionCase):
 
-    def setUp(self):
-        super(TestImportCamt, self).setUp()
+    @classmethod
+    def setUpClass(cls):
+        super(TestImportCamt, cls).setUpClass()
 
         account_bank_statement_import_obj = \
-            self.env['account.bank.statement.import']
+            cls.env['account.bank.statement.import']
 
-        account_bank_statement_line_obj =\
-            self.env['account.bank.statement.line']
+        account_bank_statement_line_obj = \
+            cls.env['account.bank.statement.line']
 
-        account_account_obj = self.env['account.account']
-        account_move_line_obj = self.env['account.move.line']
+        account_account_obj = cls.env['account.account']
+        account_move_line_obj = cls.env['account.move.line']
 
         test_file_path_camt053 = get_module_resource(
             'l10n_ch_import_camt054', 'res', 'camt.053.demo-1000.xml')