diff --git a/product/ERP5/tests/testERP5Simulation.py b/product/ERP5/tests/testERP5Simulation.py
index f214b623b8f8b1e1c60e828d7599c555eeccf21b..2735133b54c0eda1c9e5f0eee008028e6442491c 100644
--- a/product/ERP5/tests/testERP5Simulation.py
+++ b/product/ERP5/tests/testERP5Simulation.py
@@ -39,6 +39,7 @@ from Products.ERP5Type.tests.Sequence import SequenceList
 from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
 from testPackingList import TestPackingList
 from testInvoice import TestSaleInvoice, TestInvoiceMixin
+from Products.ERP5Type.tests.backportUnittest import expectedFailure
 
 class TestERP5SimulationMixin(TestInvoiceMixin):
   def getBusinessTemplateList(self):
@@ -505,6 +506,14 @@ class TestERP5Simulation(TestERP5SimulationMixin, ERP5TypeTestCase):
 class TestERP5SimulationPackingList(TestERP5SimulationMixin, TestPackingList):
   pass
 
+for failing_method in [
+  # This test does not work as it is because of the different behaviour of
+  # Adopt Solver.
+  'test_05d_SimulationChangeResourceOnOneSimulationMovementForMergedLine',
+  ]:
+  setattr(TestERP5SimulationPackingList, failing_method,
+          expectedFailure(getattr(TestERP5SimulationPackingList, failing_method)))
+        
 class TestERP5SimulationInvoice(TestERP5SimulationMixin, TestSaleInvoice):
 
   def afterSetUp(self):
diff --git a/product/ERP5/tests/testTradeModelLine.py b/product/ERP5/tests/testTradeModelLine.py
index 2df2bcb410816645806252b134a2867eb64b1745..3e2d5e5f0c08e882d88b2ca2c7dc773c16f7ebb4 100644
--- a/product/ERP5/tests/testTradeModelLine.py
+++ b/product/ERP5/tests/testTradeModelLine.py
@@ -37,6 +37,7 @@ from Products.CMFCore.utils import getToolByName
 from Products.ERP5.PropertySheet.TradeModelLine import (TARGET_LEVEL_MOVEMENT,
                                                         TARGET_LEVEL_DELIVERY)
 from Products.ERP5Type.tests.utils import createZODBPythonScript
+from Products.ERP5Type.tests.backportUnittest import expectedFailure
 
 class TestTradeModelLineMixin(TestBPMMixin):
   """Provides methods to implementations sharing similar logic to Trade Model Lines"""
@@ -2068,6 +2069,8 @@ class TestTradeModelLine(TestTradeModelLineMixin):
     sequence_list.addSequenceString(sequence_string)
     sequence_list.play(self, quiet=quiet)
 
+  # This test does not work without implementing an appropriate Trade Model Solver.
+  @expectedFailure
   def test_TradeModelRuleSimulationBuildInvoiceInvoiceLineModifyDivergencyAndSolving(self, quiet=quiet):
     """Check that after changing invoice line invoice is properly diverged and it is possible to solve"""
     sequence_list = SequenceList()