diff --git a/qa/pcbnew/drc/test_drc_regressions.cpp b/qa/pcbnew/drc/test_drc_regressions.cpp
index 6af42dc421..1ad1f3cc2a 100644
--- a/qa/pcbnew/drc/test_drc_regressions.cpp
+++ b/qa/pcbnew/drc/test_drc_regressions.cpp
@@ -104,12 +104,11 @@ struct DRC_REGRESSION_TEST_FIXTURE
 };
 
 
-BOOST_FIXTURE_TEST_SUITE( TestDRCRegressions, DRC_REGRESSION_TEST_FIXTURE )
 
 constexpr int delta = KiROUND( 0.006 * IU_PER_MM );
 
 
-BOOST_AUTO_TEST_CASE( DRCFalsePositiveRegressions )
+BOOST_FIXTURE_TEST_CASE( DRCFalsePositiveRegressions, DRC_REGRESSION_TEST_FIXTURE )
 {
     // These documents at one time flagged DRC errors that they shouldn't have.
 
@@ -163,7 +162,7 @@ BOOST_AUTO_TEST_CASE( DRCFalsePositiveRegressions )
 }
 
 
-BOOST_AUTO_TEST_CASE( DRCFalseNegativeRegressions )
+BOOST_FIXTURE_TEST_CASE( DRCFalseNegativeRegressions, DRC_REGRESSION_TEST_FIXTURE )
 {
     // These documents at one time failed to catch DRC errors that they should have.
 
@@ -215,6 +214,3 @@ BOOST_AUTO_TEST_CASE( DRCFalseNegativeRegressions )
         }
     }
 }
-
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/qa/pcbnew/test_zone_filler.cpp b/qa/pcbnew/test_zone_filler.cpp
index c89102a898..202f1e99f4 100644
--- a/qa/pcbnew/test_zone_filler.cpp
+++ b/qa/pcbnew/test_zone_filler.cpp
@@ -104,12 +104,10 @@ struct ZONE_FILL_TEST_FIXTURE
 };
 
 
-BOOST_FIXTURE_TEST_SUITE( TestZoneFiller, ZONE_FILL_TEST_FIXTURE )
-
 constexpr int delta = KiROUND( 0.006 * IU_PER_MM );
 
 
-BOOST_AUTO_TEST_CASE( BasicZoneFills )
+BOOST_FIXTURE_TEST_CASE( BasicZoneFills, ZONE_FILL_TEST_FIXTURE )
 {
     loadBoard( "zone_filler" );
 
@@ -195,7 +193,7 @@ BOOST_AUTO_TEST_CASE( BasicZoneFills )
 }
 
 
-BOOST_AUTO_TEST_CASE( NotchedZones )
+BOOST_FIXTURE_TEST_CASE( NotchedZones, ZONE_FILL_TEST_FIXTURE )
 {
     loadBoard( "notched_zones" );
 
@@ -235,7 +233,7 @@ BOOST_AUTO_TEST_CASE( NotchedZones )
 }
 
 
-BOOST_AUTO_TEST_CASE( RegressionZoneFillTests )
+BOOST_FIXTURE_TEST_CASE( RegressionZoneFillTests, ZONE_FILL_TEST_FIXTURE )
 {
     std::vector<wxString> tests = { "issue18",
                                     "issue2568",
@@ -294,5 +292,3 @@ BOOST_AUTO_TEST_CASE( RegressionZoneFillTests )
     }
 }
 
-
-BOOST_AUTO_TEST_SUITE_END()