diff --git a/product/ERP5/tests/testBPMEvaluation.py b/product/ERP5/tests/testBPMEvaluation.py
index 51a370b3b8cc417c874fa69f4e9948d2ac754069..1921550ad970fba43a22b02fdbe54e5bb7dd4426 100644
--- a/product/ERP5/tests/testBPMEvaluation.py
+++ b/product/ERP5/tests/testBPMEvaluation.py
@@ -39,6 +39,7 @@ It is advised to *NOT* remove erp5_administration.
 import unittest
 import transaction
 
+from Products.ERP5Type.tests.backportUnittest import expectedFailure, skip
 from Products.ERP5.tests.testBPMCore import TestBPMMixin
 
 from DateTime import DateTime
@@ -878,11 +879,17 @@ class TestInvoiceDifferentProcess(TestInvoice,
 
 def test_suite():
   suite = unittest.TestSuite()
-  suite.addTest(unittest.makeSuite(TestOrderDefaultProcess))
-  suite.addTest(unittest.makeSuite(TestPackingListDefaultProcess))
-#  suite.addTest(unittest.makeSuite(TestInvoiceDefaultProcess))
-
-  suite.addTest(unittest.makeSuite(TestOrderDifferentProcess))
-  suite.addTest(unittest.makeSuite(TestPackingListDifferentProcess))
-#  suite.addTest(unittest.makeSuite(TestInvoiceDifferentProcess))
+  import os
+  if int(os.environ.get('erp5_report_new_simulation_failures') or 0):
+    decorate = lambda test_case: test_case
+  else:
+    decorate = skip("broken since r39918")
+  for test_case in (TestOrderDefaultProcess,
+                    TestPackingListDefaultProcess,
+                    #TestInvoiceDefaultProcess,
+                    TestOrderDifferentProcess,
+                    TestPackingListDifferentProcess,
+                    #TestInvoiceDifferentProcess,
+                   ):
+    suite.addTest(unittest.makeSuite(decorate(test_case)))
   return suite