diff --git a/rma/tests/test_rma.py b/rma/tests/test_rma.py
index 8787b177..882e9a37 100644
--- a/rma/tests/test_rma.py
+++ b/rma/tests/test_rma.py
@@ -76,7 +76,6 @@ class TestRma(TransactionCase):
             {"name": "[Test] It's out of warranty. To be scrapped"}
         )
         cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
-        cls.env.ref("stock.group_stock_multi_locations").users |= cls.env.user
         cls.warehouse = cls.env.ref("stock.warehouse0")
         # Ensure grouping
         cls.env.company.rma_return_grouping = True
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index fbd46722..9a3a10b0 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -17,6 +17,7 @@
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />
+                    <field name="location_id" invisible="1" />
                 </group>
             </field>
         </field>