diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx
index 1691ba2a8e..bcfd329a9a 100644
--- a/src/StepData/StepData_StepReaderData.cxx
+++ b/src/StepData/StepData_StepReaderData.cxx
@@ -178,16 +178,13 @@ void StepData_StepReaderData::SetRecord (const Standard_Integer num,
 	  //themults.SetValue(prev,num);
           themults.Bind(prev,num);
           if(thenametypes.FindKey(thetypes.Value(num)).IsLess(thenametypes.FindKey(thetypes.Value(prev)))) {
-	  //if (thetypes.Value(num).IsLess(thetypes.Value(prev))) 
-
-//  ERREUR : Type complexe pas en ordre alphabetique. On enregistre.
+      //  Warning: components in complex entity are not in alphabetical order.
 	    TCollection_AsciiString errm("Complex Type incorrect : ");
 	    errm.AssignCat(thenametypes.FindKey(thetypes.Value(prev)));
 	    errm.AssignCat(" / ");
 	    errm.AssignCat(thenametypes.FindKey(thetypes.Value(num)));
 	    errm.AssignCat(" ... ");
-	    thecheck->AddFail(errm.ToCString(),"Complex Type incorrect : ");
-//  On Affiche a l ecran, le plus de donnees possibles
+#ifdef OCCT_DEBUG
 	    while (theidents(prev) <= 0) {
 	      prev --;  if (prev <= 0) break;
 	    }
@@ -196,6 +193,8 @@ void StepData_StepReaderData::SetRecord (const Standard_Integer num,
 	      << " -> " << num*100/NbRecords() << " % in File)  ***";
 	    if (prev > 0) sout << "  Ident #" << theidents(prev);
 	    sout << "\n" << errm << endl;
+#endif
+      thecheck->AddWarning(errm.ToCString(),"Complex Type incorrect : ");
 	  }
 	  break;
 	}
diff --git a/tests/bugs/modalg_6/bug27341_329 b/tests/bugs/modalg_6/bug27341_329
index 3313c76201..9d5402b9b7 100644
--- a/tests/bugs/modalg_6/bug27341_329
+++ b/tests/bugs/modalg_6/bug27341_329
@@ -1,5 +1,3 @@
-puts "TODO OCC27532 ALL: Error on Record"
-
 puts "============"
 puts "OCC27341"
 puts "============"
diff --git a/tests/bugs/step/bug2368 b/tests/bugs/step/bug2368
index 46dfe0d928..8238037a77 100644
--- a/tests/bugs/step/bug2368
+++ b/tests/bugs/step/bug2368
@@ -1,6 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-puts "TODO OCC12345 ALL: OCC2368: Error during reading attached IGES file"
-
 puts "============"
 puts "OCC2368"
 puts "============"
diff --git a/tests/bugs/step/bug348_1 b/tests/bugs/step/bug348_1
index 4e39634c70..f2ca11ce2b 100755
--- a/tests/bugs/step/bug348_1
+++ b/tests/bugs/step/bug348_1
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"
diff --git a/tests/bugs/step/bug348_2 b/tests/bugs/step/bug348_2
index 48fcceafc8..9c639e3bf6 100755
--- a/tests/bugs/step/bug348_2
+++ b/tests/bugs/step/bug348_2
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"
diff --git a/tests/bugs/step/bug348_3 b/tests/bugs/step/bug348_3
index b6afc894ee..5a46494d4b 100755
--- a/tests/bugs/step/bug348_3
+++ b/tests/bugs/step/bug348_3
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"
diff --git a/tests/bugs/step/bug348_4 b/tests/bugs/step/bug348_4
index 23c7cc6c5e..d46c1fd2e5 100755
--- a/tests/bugs/step/bug348_4
+++ b/tests/bugs/step/bug348_4
@@ -1,5 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
-
 puts "========"
 puts "OCC205"
 puts "OCC348"
diff --git a/tests/bugs/step/bug926 b/tests/bugs/step/bug926
index 3573a31109..c2d8049496 100755
--- a/tests/bugs/step/bug926
+++ b/tests/bugs/step/bug926
@@ -1,4 +1,3 @@
-puts "TODO OCC12345 ALL: Error on Record"
 puts "TODO OCC12345 ALL: Error : OCC926 is WRONG because number of "
 
 puts "================"
diff --git a/tests/bugs/step/parse.rules b/tests/bugs/step/parse.rules
deleted file mode 100644
index c48aff7892..0000000000
--- a/tests/bugs/step/parse.rules
+++ /dev/null
@@ -1 +0,0 @@
-IGNORE /Error on Record/ message during loading file
diff --git a/tests/bugs/vis/bug23153 b/tests/bugs/vis/bug23153
index 98bf47e223..9f615399bd 100755
--- a/tests/bugs/vis/bug23153
+++ b/tests/bugs/vis/bug23153
@@ -1,4 +1,4 @@
-puts "REQUIRED All: \\*\\*\\*  Error on Record"
+#puts "REQUIRED All: \\*\\*\\*  Error on Record"
 puts "============"
 puts "OCC23153"
 puts "============"
diff --git a/tests/bugs/xde/bug22982 b/tests/bugs/xde/bug22982
index 37b16449ca..b21c742605 100755
--- a/tests/bugs/xde/bug22982
+++ b/tests/bugs/xde/bug22982
@@ -1,5 +1,3 @@
-puts "TODO OCC22982 ALL: Error on Record"
-# errors appear during reading source step file
 pload QAcommands
 
 puts "============"
diff --git a/tests/de/parse.rules b/tests/de/parse.rules
index 4ac2e98cd5..813616d1cf 100644
--- a/tests/de/parse.rules
+++ b/tests/de/parse.rules
@@ -1,5 +1,4 @@
 FAILED /\bFaulty\b/ error
-IGNORE /Error on Record/ message during loading file
 IGNORE /Software error/ message in tpstat
 IGNORE /Syntax error/ message in data c
 IGNORE /Transfer error/ message in tpstat
diff --git a/tests/xcaf/stp_to_xbf/G7 b/tests/xcaf/stp_to_xbf/G7
index c7fd9dfe72..fadee12560 100644
--- a/tests/xcaf/stp_to_xbf/G7
+++ b/tests/xcaf/stp_to_xbf/G7
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj3_d1-tc-214.stp]
 set TypeOfFile ""
 set AddToDocument ""
diff --git a/tests/xcaf/stp_to_xbf/I1 b/tests/xcaf/stp_to_xbf/I1
index 3145530bcb..8cfcba046d 100644
--- a/tests/xcaf/stp_to_xbf/I1
+++ b/tests/xcaf/stp_to_xbf/I1
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj4_d2-tc-214.stp]
 set TypeOfFile ""
 set AddToDocument ""
diff --git a/tests/xcaf/stp_to_xbf/I2 b/tests/xcaf/stp_to_xbf/I2
index 0a3d48b55e..6074649770 100644
--- a/tests/xcaf/stp_to_xbf/I2
+++ b/tests/xcaf/stp_to_xbf/I2
@@ -1,4 +1,3 @@
-puts "TODO OCC23469 ALL: Error on Record "
 ReadStep D_First [locate_data_file trj4_d2-tu-214.stp]
 set TypeOfFile ""
 set AddToDocument ""