diff --git a/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp b/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp
index 6aa66603c4..d9239bb78e 100644
--- a/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp
+++ b/pcbnew/drc/drc_test_provider_courtyard_clearance.cpp
@@ -235,9 +235,9 @@ bool DRC_TEST_PROVIDER_COURTYARD_CLEARANCE::testCourtyardClearances()
                                                       actual );
 
                             drce->SetErrorMessage( drce->GetErrorText() + wxS( " " ) + msg );
-                            drce->SetViolatingRule( constraint.GetParentRule() );
                         }
 
+                        drce->SetViolatingRule( constraint.GetParentRule() );
                         drce->SetItems( fpA, fpB );
                         reportViolation( drce, pos, F_CrtYd );
                     }
@@ -268,9 +268,9 @@ bool DRC_TEST_PROVIDER_COURTYARD_CLEARANCE::testCourtyardClearances()
                                                       actual );
 
                             drce->SetErrorMessage( drce->GetErrorText() + wxS( " " ) + msg );
-                            drce->SetViolatingRule( constraint.GetParentRule() );
                         }
 
+                        drce->SetViolatingRule( constraint.GetParentRule() );
                         drce->SetItems( fpA, fpB );
                         reportViolation( drce, pos, B_CrtYd );
                     }
diff --git a/pcbnew/drc/drc_test_provider_solder_mask.cpp b/pcbnew/drc/drc_test_provider_solder_mask.cpp
index 6dc3a9af2e..295a4aaf8a 100644
--- a/pcbnew/drc/drc_test_provider_solder_mask.cpp
+++ b/pcbnew/drc/drc_test_provider_solder_mask.cpp
@@ -307,12 +307,17 @@ void DRC_TEST_PROVIDER_SOLDER_MASK::testSilkToMaskClearance()
                                                                clearance, &actual, &pos ) )
                     {
                         auto drce = DRC_ITEM::Create( DRCE_SILK_CLEARANCE );
-                        wxString msg = formatMsg( _( "(%s clearance %s; actual %s)" ),
-                                                  constraint.GetName(),
-                                                  clearance,
-                                                  actual );
 
-                        drce->SetErrorMessage( drce->GetErrorText() + wxS( " " ) + msg );
+                        if( clearance > 0 )
+                        {
+                            wxString msg = formatMsg( _( "(%s clearance %s; actual %s)" ),
+                                                      constraint.GetName(),
+                                                      clearance,
+                                                      actual );
+
+                            drce->SetErrorMessage( drce->GetErrorText() + wxS( " " ) + msg );
+                        }
+
                         drce->SetItems( item );
                         drce->SetViolatingRule( constraint.GetParentRule() );