diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index d4f38d71ca..44fcfdfc30 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -238,6 +238,7 @@ set( PCBNEW_DRC_SRCS
     drc/drc_test_provider_disallow.cpp
     drc/drc_test_provider_connectivity.cpp
     drc/drc_test_provider_copper_clearance.cpp
+    drc/drc_test_provider_courtyard_clearance.cpp
     drc/drc_test_provider_edge_clearance.cpp
     drc/drc_test_provider_hole_clearance.cpp
     drc/drc_test_provider_hole_size.cpp
diff --git a/pcbnew/drc/drc_engine.cpp b/pcbnew/drc/drc_engine.cpp
index 7f40396446..ca52eb3f96 100644
--- a/pcbnew/drc/drc_engine.cpp
+++ b/pcbnew/drc/drc_engine.cpp
@@ -405,13 +405,15 @@ void DRC_ENGINE::RunTests( EDA_UNITS aUnits, bool aTestTracksAgainstZones,
     m_reportAllTrackErrors = aReportAllTrackErrors;
     m_testFootprints = aTestFootprints;
 
-    int phases = 0;
-
-    for( DRC_TEST_PROVIDER* provider : m_testProviders )
-        phases += provider->GetNumPhases();
-
     if( m_progressReporter )
+    {
+        int phases = 0;
+
+        for( DRC_TEST_PROVIDER* provider : m_testProviders )
+            phases += provider->GetNumPhases();
+
         m_progressReporter->AddPhases( phases );
+    }
 
     for( int ii = DRCE_FIRST; ii < DRCE_LAST; ++ii )
     {
diff --git a/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp b/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp
index 44e958d3cd..290c215ce0 100644
--- a/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp
+++ b/qa/pcbnew/drc/test_drc_courtyard_invalid.cpp
@@ -302,6 +302,7 @@ void DoCourtyardInvalidTest( const COURTYARD_INVALID_CASE& aCase,
             [&]( const std::shared_ptr<DRC_ITEM>& aItem, wxPoint aPos )
             {
                 if(    aItem->GetErrorCode() == DRCE_OVERLAPPING_FOOTPRINTS
+                    || aItem->GetErrorCode() == DRCE_MALFORMED_COURTYARD
                     || aItem->GetErrorCode() == DRCE_MISSING_COURTYARD )
                 {
                     markers.push_back( std::make_unique<MARKER_PCB>( aItem, aPos ) );
diff --git a/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp b/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp
index 5baaf3406c..5c721149da 100644
--- a/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp
+++ b/qa/pcbnew/drc/test_drc_courtyard_overlap.cpp
@@ -471,6 +471,7 @@ static void DoCourtyardOverlapTest( const COURTYARD_OVERLAP_TEST_CASE& aCase,
             [&]( const std::shared_ptr<DRC_ITEM>& aItem, wxPoint aPos )
             {
                 if(    aItem->GetErrorCode() == DRCE_OVERLAPPING_FOOTPRINTS
+                    || aItem->GetErrorCode() == DRCE_MALFORMED_COURTYARD
                     || aItem->GetErrorCode() == DRCE_MISSING_COURTYARD )
                 {
                     markers.push_back( std::make_unique<MARKER_PCB>( aItem, aPos ) );