diff --git a/addons/account_invoice_layout/account_invoice_layout_report.xml b/addons/account_invoice_layout/account_invoice_layout_report.xml
index ba7f44f0661..d5148b41cd3 100644
--- a/addons/account_invoice_layout/account_invoice_layout_report.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_report.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <openerp>
-	<data>
+    <data>
 
-	<report id="account_invoices_1"
-			string="Invoices with Layout"
-			model="account.invoice"
-			name="account.invoice.layout"
-			rml="account_invoice_layout/report/report_account_invoice_layout.rml"
-			auto="False"/>
-	
-	<report id="account_invoices_layout_message"
-			menu="False"
-			string="Invoices with Layout and Message"
-			model="account.invoice"
-			name="notify_account.invoice"
-			rml="account_invoice_layout/report/special_message_invoice.rml"
-			auto="False"/>
+    <report id="account_invoices_1"
+            string="Invoices"
+            model="account.invoice"
+            name="account.invoice.layout"
+            rml="account_invoice_layout/report/report_account_invoice_layout.rml"
+            auto="False"/>
+    
+    <report id="account_invoices_layout_message"
+            menu="False"
+            string="Invoices and Message"
+            model="account.invoice"
+            name="notify_account.invoice"
+            rml="account_invoice_layout/report/special_message_invoice.rml"
+            auto="False"/>
 
-	</data>
+    </data>
 </openerp>
diff --git a/addons/account_invoice_layout/test/account_invoice_layout_report.yml b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
index 91967358a3d..61ca39c654b 100644
--- a/addons/account_invoice_layout/test/account_invoice_layout_report.yml
+++ b/addons/account_invoice_layout/test/account_invoice_layout_report.yml
@@ -1,22 +1,9 @@
--
-  In order to Print the Invoice layout report in Normal Mode, we will create a invoice record
--
-  !record {model: account.invoice, id: test_invoice_1}:
-    currency_id: base.EUR
-    company_id: base.main_company
-    address_invoice_id: base.res_partner_address_tang
-    partner_id: base.res_partner_asus
-    state: draft
-    type: out_invoice
-    account_id: account.a_recv
-    name: Test invoice 1
-    address_contact_id: base.res_partner_address_tang
 -
   Print the Invoice layout report in Normal Mode
 -
   !python {model: account.invoice}: |
     import netsvc, tools, os
-    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('test_invoice_1')], {}, {})
+    (data, format) = netsvc.LocalService('report.account.invoice.layout').create(cr, uid, [ref('account.demo_invoice_0')], {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'account_invoice_layout.'+format), 'wb+').write(data)
 
@@ -25,7 +12,7 @@
 -
   !python {model: account.invoice}: |
     ctx={}
-    ctx.update({'model': 'account.invoice','active_ids': [ref('test_invoice_1')]})
+    ctx.update({'model': 'account.invoice','active_ids': [ref('account.demo_invoice_0')]})
     data_dict = {'message':ref('account_invoice_layout.demo_message1')}
     from tools import test_reports
     test_reports.try_report_action(cr, uid, 'action_account_invoice_special_msg',wiz_data=data_dict, context=ctx, our_module='account_invoice_layout')
diff --git a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
index b1cf7357241..d849595bfca 100644
--- a/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
+++ b/addons/account_invoice_layout/wizard/account_invoice_special_message.xml
@@ -2,43 +2,43 @@
 <openerp>
     <data>
 
-		<record id="account_invoice_special_msg_view" model="ir.ui.view">
-			<field name="name">Account Invioce Special Message</field>
-			<field name="model">account.invoice.special.msg</field>
-			<field name="type">form</field>
-			<field name="arch" type="xml">
-				<form string="Select Message">
-					<group colspan="4" col="6">
-						<field name="message"/>
-					</group>
-					<separator colspan="4"/>
-					<group colspan="4" col="6">
-						<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-						<button name="check_report" string="Print" type="object" icon="gtk-print"/>
-					</group>
-				</form>
-			</field>
-		</record>
+        <record id="account_invoice_special_msg_view" model="ir.ui.view">
+            <field name="name">Account Invioce Special Message</field>
+            <field name="model">account.invoice.special.msg</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Message">
+                    <group colspan="4" col="6">
+                        <field name="message"/>
+                    </group>
+                    <separator colspan="4"/>
+                    <group colspan="4" col="6">
+                        <button special="cancel" string="Cancel" icon="gtk-cancel"/>
+                        <button name="check_report" string="Print" type="object" icon="gtk-print"/>
+                    </group>
+                </form>
+            </field>
+        </record>
 
-		<record id="action_account_invoice_special_msg" model="ir.actions.act_window">
-			<field name="name">Invoices with Layout and Message</field>
-			<field name="type">ir.actions.act_window</field>
-			<field name="res_model">account.invoice.special.msg</field>
-			<field name="view_type">form</field>
-			<field name="view_mode">form</field>
-			<field name="view_id" ref="account_invoice_special_msg_view"/>
-			<field name="target">new</field>
-		</record>
+        <record id="action_account_invoice_special_msg" model="ir.actions.act_window">
+            <field name="name">Invoices and Message</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">account.invoice.special.msg</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="account_invoice_special_msg_view"/>
+            <field name="target">new</field>
+        </record>
 
-		<record model="ir.values" id="account_invoice_special_msg_values">
-			<field name="model_id" ref="account.model_account_invoice" />
-			<field name="object" eval="1" />
-			<field name="name">Account Invioce Special Message</field>
-			<field name="key2">client_print_multi</field>
-			<field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_invoice_special_msg'))" />
-			<field name="key">action</field>
-			<field name="model">account.invoice</field>
-		</record>
+        <record model="ir.values" id="account_invoice_special_msg_values">
+            <field name="model_id" ref="account.model_account_invoice" />
+            <field name="object" eval="1" />
+            <field name="name">Account Invioce Special Message</field>
+            <field name="key2">client_print_multi</field>
+            <field name="value" eval="'ir.actions.act_window,' + str(ref('action_account_invoice_special_msg'))" />
+            <field name="key">action</field>
+            <field name="model">account.invoice</field>
+        </record>
 
     </data>
-</openerp>
\ No newline at end of file
+</openerp>