diff --git a/test-suite/asianoptions.cpp b/test-suite/asianoptions.cpp
index 6fd7b845ce3..bcaac8fc131 100644
--- a/test-suite/asianoptions.cpp
+++ b/test-suite/asianoptions.cpp
@@ -1908,10 +1908,6 @@ BOOST_AUTO_TEST_CASE(testTurnbullWakemanAsianEngine) {
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(AsianOptionExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testLevyEngine) {
 
     BOOST_TEST_MESSAGE("Testing Levy engine for Asians options...");
@@ -2401,4 +2397,4 @@ BOOST_AUTO_TEST_CASE(testDiscreteGeometricAveragePriceHestonPastFixings) {
 }
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/barrieroption.cpp b/test-suite/barrieroption.cpp
index f73885a281f..0ba1535dfa3 100644
--- a/test-suite/barrieroption.cpp
+++ b/test-suite/barrieroption.cpp
@@ -1366,10 +1366,6 @@ BOOST_AUTO_TEST_CASE(testLowVolatility) {
     check(  95.0,  Option::Call,      99.0,   Barrier::DownIn,     4.0,   0.01,   0.04,        2.0);  // fwd = 97, call, ITM
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(BarrierOptionExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testPerturbative) {
     BOOST_TEST_MESSAGE("Testing perturbative engine for barrier options...");
 
@@ -1688,4 +1684,4 @@ BOOST_AUTO_TEST_CASE(testVannaVolgaSimpleBarrierValues) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/basismodels.cpp b/test-suite/basismodels.cpp
index d4390b928f8..76525cc461c 100644
--- a/test-suite/basismodels.cpp
+++ b/test-suite/basismodels.cpp
@@ -226,7 +226,7 @@ namespace {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(BasismodelsExperimentalTest)
+BOOST_AUTO_TEST_SUITE(BasisModelsTest)
 
 BOOST_AUTO_TEST_CASE(testSwaptioncfsContCompSpread) {
     BOOST_TEST_MESSAGE(
@@ -402,4 +402,4 @@ BOOST_AUTO_TEST_CASE(testTenorswaptionvts) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/basisswapratehelpers.cpp b/test-suite/basisswapratehelpers.cpp
index 8b9affad4bc..a135cbd0a13 100644
--- a/test-suite/basisswapratehelpers.cpp
+++ b/test-suite/basisswapratehelpers.cpp
@@ -212,7 +212,7 @@ namespace basisswapratehelpers_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(BasisSwapRateHelpersExperimentalTest)
+BOOST_AUTO_TEST_SUITE(BasisSwapRateHelpersTest)
 
 BOOST_AUTO_TEST_CASE(testIborIborBaseCurveBootstrap) {
     BOOST_TEST_MESSAGE("Testing IBOR-IBOR basis-swap rate helpers (base curve bootstrap)...");
@@ -240,4 +240,4 @@ BOOST_AUTO_TEST_CASE(testOvernightIborBootstrapWithDiscountCurve) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/blackdeltacalculator.cpp b/test-suite/blackdeltacalculator.cpp
index 89c5c08c493..4ff813f3906 100644
--- a/test-suite/blackdeltacalculator.cpp
+++ b/test-suite/blackdeltacalculator.cpp
@@ -63,7 +63,7 @@ namespace black_delta_calculator_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(BlackDeltaCalculatorExperimentalTest)
+BOOST_AUTO_TEST_SUITE(BlackDeltaCalculatorTest)
 
 BOOST_AUTO_TEST_CASE(testDeltaValues){
 
diff --git a/test-suite/callablebonds.cpp b/test-suite/callablebonds.cpp
index 07344ff4a71..b9945e36406 100644
--- a/test-suite/callablebonds.cpp
+++ b/test-suite/callablebonds.cpp
@@ -96,7 +96,7 @@ namespace {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CallableBondExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CallableBondTest)
 
 BOOST_AUTO_TEST_CASE(testInterplay) {
 
@@ -826,4 +826,4 @@ BOOST_AUTO_TEST_CASE(testCallableFixedRateBondWithArbitrarySchedule) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/catbonds.cpp b/test-suite/catbonds.cpp
index aed9fbde849..67a9b03b3a7 100644
--- a/test-suite/catbonds.cpp
+++ b/test-suite/catbonds.cpp
@@ -73,7 +73,7 @@ namespace catbonds_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CatBondExperimentaltest)
+BOOST_AUTO_TEST_SUITE(CatBondTest)
 
 BOOST_AUTO_TEST_CASE(testEventSetForWholeYears) {
     BOOST_TEST_MESSAGE("Testing that catastrophe events are split correctly for periods of whole years...");
@@ -679,4 +679,4 @@ BOOST_AUTO_TEST_CASE(testCatBondWithGeneratedEventsProportional) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/cdo.cpp b/test-suite/cdo.cpp
index 362b130610e..eccdd9b24da 100644
--- a/test-suite/cdo.cpp
+++ b/test-suite/cdo.cpp
@@ -94,7 +94,7 @@ namespace cdo_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CdoExperimentalTest, *precondition(if_speed(Slow)))
+BOOST_AUTO_TEST_SUITE(CdoTest, *precondition(if_speed(Slow)))
 
 #ifndef QL_PATCH_SOLARIS
 
diff --git a/test-suite/cdsoption.cpp b/test-suite/cdsoption.cpp
index 889b3edf365..28c4755ecd6 100644
--- a/test-suite/cdsoption.cpp
+++ b/test-suite/cdsoption.cpp
@@ -36,7 +36,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CdsOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CdsOptionTest)
 
 BOOST_AUTO_TEST_CASE(testCached) {
 
@@ -118,4 +118,4 @@ BOOST_AUTO_TEST_CASE(testCached) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/cmsspread.cpp b/test-suite/cmsspread.cpp
index ffcdb38b1eb..762d8d6330c 100644
--- a/test-suite/cmsspread.cpp
+++ b/test-suite/cmsspread.cpp
@@ -93,7 +93,7 @@ struct TestData {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CmsSpreadExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CmsSpreadTest)
 
 BOOST_AUTO_TEST_CASE(testFixings) {
     BOOST_TEST_MESSAGE("Testing fixings of cms spread indices...");
@@ -349,4 +349,4 @@ BOOST_AUTO_TEST_CASE(testCouponPricing) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/commodityunitofmeasure.cpp b/test-suite/commodityunitofmeasure.cpp
index a34acbe1169..69fbe3de8a2 100644
--- a/test-suite/commodityunitofmeasure.cpp
+++ b/test-suite/commodityunitofmeasure.cpp
@@ -27,7 +27,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CommodityUnitOfMeasureExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CommodityUnitOfMeasureTest)
 
 BOOST_AUTO_TEST_CASE(testDirect) {
 
diff --git a/test-suite/compiledboostversion.cpp b/test-suite/compiledboostversion.cpp
index aec138c9083..ef6322ffca0 100644
--- a/test-suite/compiledboostversion.cpp
+++ b/test-suite/compiledboostversion.cpp
@@ -29,7 +29,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CompiledBoostVersionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CompiledBoostVersionTest)
 
 BOOST_AUTO_TEST_CASE(test) {
 
@@ -41,4 +41,4 @@ BOOST_AUTO_TEST_CASE(test) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/creditriskplus.cpp b/test-suite/creditriskplus.cpp
index a57c3684be5..90340bb0afa 100644
--- a/test-suite/creditriskplus.cpp
+++ b/test-suite/creditriskplus.cpp
@@ -27,7 +27,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(CreditRiskPlusExperimentalTest)
+BOOST_AUTO_TEST_SUITE(CreditRiskPlusTest)
 
 BOOST_AUTO_TEST_CASE(testReferenceValues) {
 
@@ -125,4 +125,4 @@ BOOST_AUTO_TEST_CASE(testReferenceValues) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/doublebarrieroption.cpp b/test-suite/doublebarrieroption.cpp
index a321fb8d94e..71ca0e540fb 100644
--- a/test-suite/doublebarrieroption.cpp
+++ b/test-suite/doublebarrieroption.cpp
@@ -387,10 +387,6 @@ BOOST_AUTO_TEST_CASE(testEuropeanHaugValues) {
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(DoubleBarrierOptionExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testVannaVolgaDoubleBarrierValues) {
     BOOST_TEST_MESSAGE(
          "Testing double-barrier FX options against Vanna/Volga values...");
@@ -642,4 +638,4 @@ BOOST_AUTO_TEST_CASE(testMonteCarloDoubleBarrierWithAnalytical, *precondition(if
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/europeanoption.cpp b/test-suite/europeanoption.cpp
index 8e0113b2e5d..c3a9f565b51 100644
--- a/test-suite/europeanoption.cpp
+++ b/test-suite/europeanoption.cpp
@@ -1781,10 +1781,6 @@ BOOST_AUTO_TEST_CASE(testVanillaAndDividendEngine) {
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(EuropeanOptionExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testFFTEngines) {
 
     BOOST_TEST_MESSAGE("Testing FFT European engines "
@@ -1802,4 +1798,4 @@ BOOST_AUTO_TEST_CASE(testFFTEngines) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/everestoption.cpp b/test-suite/everestoption.cpp
index 910f161379d..34ed30847da 100644
--- a/test-suite/everestoption.cpp
+++ b/test-suite/everestoption.cpp
@@ -30,7 +30,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(EverestOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(EverestOptionTest)
 
 BOOST_AUTO_TEST_CASE(testCached) {
 
@@ -135,4 +135,4 @@ BOOST_AUTO_TEST_CASE(testCached) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/extendedtrees.cpp b/test-suite/extendedtrees.cpp
index 293c5e1693b..078bab89775 100644
--- a/test-suite/extendedtrees.cpp
+++ b/test-suite/extendedtrees.cpp
@@ -232,7 +232,7 @@ namespace {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(ExtendedTreesExperimentalTest)
+BOOST_AUTO_TEST_SUITE(ExtendedTreesTest)
 
 BOOST_AUTO_TEST_CASE(testJRBinomialEngines) {
 
@@ -355,4 +355,4 @@ BOOST_AUTO_TEST_CASE(testJOSHIBinomialEngines) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/extensibleoptions.cpp b/test-suite/extensibleoptions.cpp
index 7795f735ae0..d8dd1f73973 100644
--- a/test-suite/extensibleoptions.cpp
+++ b/test-suite/extensibleoptions.cpp
@@ -33,7 +33,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(ExtensibleOptionsExperimentalTest)
+BOOST_AUTO_TEST_SUITE(ExtensibleOptionsTest)
 
 BOOST_AUTO_TEST_CASE(testAnalyticHolderExtensibleOptionEngine) {
     BOOST_TEST_MESSAGE(
@@ -153,4 +153,4 @@ BOOST_AUTO_TEST_CASE(testAnalyticWriterExtensibleOptionEngine) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/gaussianquadratures.cpp b/test-suite/gaussianquadratures.cpp
index 78bda11b04b..6a25c9539c2 100644
--- a/test-suite/gaussianquadratures.cpp
+++ b/test-suite/gaussianquadratures.cpp
@@ -286,10 +286,6 @@ BOOST_AUTO_TEST_CASE(testGaussLaguerreCosinePolynomial) {
                x_inv_exp, 1.0);
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(GaussianQuadraturesExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testNonCentralChiSquared) {
     BOOST_TEST_MESSAGE(
         "Testing Gauss non-central chi-squared integration...");
@@ -351,4 +347,4 @@ BOOST_AUTO_TEST_CASE(testNonCentralChiSquaredSumOfNodes) {
 }
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/hestonmodel.cpp b/test-suite/hestonmodel.cpp
index 126e2a32905..e2db2d302b0 100644
--- a/test-suite/hestonmodel.cpp
+++ b/test-suite/hestonmodel.cpp
@@ -3212,10 +3212,6 @@ BOOST_AUTO_TEST_CASE(testLocalVolFromHestonModel) {
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(HestonModelExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testAnalyticPDFHestonEngine) {
     BOOST_TEST_MESSAGE("Testing analytic PDF Heston engine...");
 
diff --git a/test-suite/inflationcpicapfloor.cpp b/test-suite/inflationcpicapfloor.cpp
index 14fa742c888..990332e82e1 100644
--- a/test-suite/inflationcpicapfloor.cpp
+++ b/test-suite/inflationcpicapfloor.cpp
@@ -309,7 +309,7 @@ namespace inflation_cpi_capfloor_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(InflationCPICapFloorExperimentalTest)
+BOOST_AUTO_TEST_SUITE(InflationCPICapFloorTest)
 
 BOOST_AUTO_TEST_CASE(cpicapfloorpricesurface) {
     BOOST_TEST_MESSAGE("Checking CPI cap/floor against price surface...");
@@ -445,4 +445,4 @@ BOOST_AUTO_TEST_CASE(cpicapfloorpricer) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/inflationvolatility.cpp b/test-suite/inflationvolatility.cpp
index d4660a08d6c..6d1e02e250f 100644
--- a/test-suite/inflationvolatility.cpp
+++ b/test-suite/inflationvolatility.cpp
@@ -275,7 +275,7 @@ namespace inflation_volatility_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(InflationVolExperimentalTest)
+BOOST_AUTO_TEST_SUITE(InflationVolTest)
 
 BOOST_AUTO_TEST_CASE(testYoYPriceSurfaceToVol) {
     BOOST_TEST_MESSAGE("Testing conversion from YoY price surface "
@@ -405,4 +405,4 @@ BOOST_AUTO_TEST_CASE(testYoYPriceSurfaceToATM) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/noarbsabr.cpp b/test-suite/noarbsabr.cpp
index ab007c20aea..8dd74d9bfdc 100644
--- a/test-suite/noarbsabr.cpp
+++ b/test-suite/noarbsabr.cpp
@@ -45,7 +45,7 @@ void checkD0(const Real sigmaI, const Real beta, const Real rho, const Real nu,
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(NoArbSabrExperimentalTest)
+BOOST_AUTO_TEST_SUITE(NoArbSabrTest)
 
 BOOST_AUTO_TEST_CASE(testAbsorptionMatrix) {
 
@@ -123,4 +123,4 @@ BOOST_AUTO_TEST_CASE(testConsistencyWithHagan) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/normalclvmodel.cpp b/test-suite/normalclvmodel.cpp
index fdf935a72a1..94416947847 100644
--- a/test-suite/normalclvmodel.cpp
+++ b/test-suite/normalclvmodel.cpp
@@ -53,7 +53,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(NormalCLVModelExperimentalTest)
+BOOST_AUTO_TEST_SUITE(NormalCLVModelTest)
 
 BOOST_AUTO_TEST_CASE(testBSCumlativeDistributionFunction) {
     BOOST_TEST_MESSAGE("Testing Black-Scholes cumulative distribution function"
@@ -539,4 +539,4 @@ BOOST_AUTO_TEST_CASE(testMoustacheGraph, *precondition(if_speed(Slow))) {
 }
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/nthtodefault.cpp b/test-suite/nthtodefault.cpp
index f2929e4d8f1..368c91ba5c8 100644
--- a/test-suite/nthtodefault.cpp
+++ b/test-suite/nthtodefault.cpp
@@ -99,7 +99,7 @@ namespace nth_to_default_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(NthToDefaultExperimentalTest)
+BOOST_AUTO_TEST_SUITE(NthToDefaultTest)
 
 #ifndef QL_PATCH_SOLARIS
 
@@ -390,4 +390,4 @@ BOOST_AUTO_TEST_CASE(testStudent, *precondition(if_speed(Slow))) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/pagodaoption.cpp b/test-suite/pagodaoption.cpp
index 25ec77ae8e7..1787f1db70e 100644
--- a/test-suite/pagodaoption.cpp
+++ b/test-suite/pagodaoption.cpp
@@ -30,7 +30,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(PagodaOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(PagodaOptionTest)
 
 BOOST_AUTO_TEST_CASE(testCached) {
 
@@ -131,4 +131,4 @@ BOOST_AUTO_TEST_CASE(testCached) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/partialtimebarrieroption.cpp b/test-suite/partialtimebarrieroption.cpp
index daaa57a677e..93c98f558cd 100644
--- a/test-suite/partialtimebarrieroption.cpp
+++ b/test-suite/partialtimebarrieroption.cpp
@@ -42,7 +42,7 @@ namespace partial_time_barrier_option_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(PartialTimeBarrierOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(PartialTimeBarrierOptionTest)
 
 BOOST_AUTO_TEST_CASE(testAnalyticEngine) {
     BOOST_TEST_MESSAGE(
@@ -131,4 +131,4 @@ BOOST_AUTO_TEST_CASE(testAnalyticEngine) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/quantooption.cpp b/test-suite/quantooption.cpp
index 12f2975846e..f35c13e0774 100644
--- a/test-suite/quantooption.cpp
+++ b/test-suite/quantooption.cpp
@@ -1267,10 +1267,6 @@ BOOST_AUTO_TEST_CASE(testAmericanQuantoOption)  {
     }
 }
 
-BOOST_AUTO_TEST_SUITE_END()
-
-BOOST_AUTO_TEST_SUITE(QuantoOptionExperimentalTest)
-
 BOOST_AUTO_TEST_CASE(testDoubleBarrierValues)  {
 
     BOOST_TEST_MESSAGE("Testing quanto-double-barrier option values...");
@@ -1348,4 +1344,4 @@ BOOST_AUTO_TEST_CASE(testDoubleBarrierValues)  {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/riskneutraldensitycalculator.cpp b/test-suite/riskneutraldensitycalculator.cpp
index a30300cacb0..4b992445d37 100644
--- a/test-suite/riskneutraldensitycalculator.cpp
+++ b/test-suite/riskneutraldensitycalculator.cpp
@@ -49,7 +49,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(RiskNeutralDensityCalculatorExperimentalTest)
+BOOST_AUTO_TEST_SUITE(RiskNeutralDensityCalculatorTest)
 
 BOOST_AUTO_TEST_CASE(testDensityAgainstOptionPrices) {
     BOOST_TEST_MESSAGE("Testing density against option prices...");
@@ -783,4 +783,4 @@ BOOST_AUTO_TEST_CASE(testCEVCDF) {
 }
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/spreadoption.cpp b/test-suite/spreadoption.cpp
index 7c0f6c4fd12..fb8ecba628f 100644
--- a/test-suite/spreadoption.cpp
+++ b/test-suite/spreadoption.cpp
@@ -62,7 +62,7 @@ struct Case {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(SpreadOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(SpreadOptionTest)
 
 BOOST_AUTO_TEST_CASE(testKirkEngine) {
     BOOST_TEST_MESSAGE("Testing Kirk approximation for spread options...");
@@ -169,4 +169,4 @@ BOOST_AUTO_TEST_CASE(testKirkEngine) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/squarerootclvmodel.cpp b/test-suite/squarerootclvmodel.cpp
index 19ae9ffa20a..e7bda2f7126 100644
--- a/test-suite/squarerootclvmodel.cpp
+++ b/test-suite/squarerootclvmodel.cpp
@@ -75,7 +75,7 @@ namespace square_root_clv_model {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(SquareRootCLVModelExperimentalTest)
+BOOST_AUTO_TEST_SUITE(SquareRootCLVModelTest)
 
 BOOST_AUTO_TEST_CASE(testSquareRootCLVVanillaPricing) {
     BOOST_TEST_MESSAGE(
@@ -811,4 +811,4 @@ namespace square_root_clv_model {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/svivolatility.cpp b/test-suite/svivolatility.cpp
index 0b9fd4ae62c..be25e775a6a 100644
--- a/test-suite/svivolatility.cpp
+++ b/test-suite/svivolatility.cpp
@@ -26,7 +26,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(SviVolatilityExperimentalTest)
+BOOST_AUTO_TEST_SUITE(SviVolatilityTest)
 
 BOOST_AUTO_TEST_CASE(testSviSmileSection) {
 
@@ -67,4 +67,4 @@ BOOST_AUTO_TEST_CASE(testSviSmileSection) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/swingoption.cpp b/test-suite/swingoption.cpp
index aa4b24144f2..d6c59614e10 100644
--- a/test-suite/swingoption.cpp
+++ b/test-suite/swingoption.cpp
@@ -107,7 +107,7 @@ namespace swing_option_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(SwingOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(SwingOptionTest)
 
 BOOST_AUTO_TEST_CASE(testExtendedOrnsteinUhlenbeckProcess) {
 
@@ -596,4 +596,4 @@ BOOST_AUTO_TEST_CASE(testKlugeChFVanillaPricing) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/twoassetbarrieroption.cpp b/test-suite/twoassetbarrieroption.cpp
index ec2bafdb5f9..18c7c2b4d40 100644
--- a/test-suite/twoassetbarrieroption.cpp
+++ b/test-suite/twoassetbarrieroption.cpp
@@ -50,7 +50,7 @@ namespace {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(TwoAssetBarrierOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(TwoAssetBarrierOptionTest)
 
 BOOST_AUTO_TEST_CASE(testHaugValues) {
 
@@ -144,4 +144,4 @@ BOOST_AUTO_TEST_CASE(testHaugValues) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/twoassetcorrelationoption.cpp b/test-suite/twoassetcorrelationoption.cpp
index cd687c078b7..5e1aff4c9b5 100644
--- a/test-suite/twoassetcorrelationoption.cpp
+++ b/test-suite/twoassetcorrelationoption.cpp
@@ -30,7 +30,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(TwoAssetCorrelationOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(TwoAssetCorrelationOptionTest)
 
 BOOST_AUTO_TEST_CASE(testAnalyticEngine) {
     BOOST_TEST_MESSAGE(
@@ -88,4 +88,4 @@ BOOST_AUTO_TEST_CASE(testAnalyticEngine) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/variancegamma.cpp b/test-suite/variancegamma.cpp
index 01544875158..4e5d6419829 100644
--- a/test-suite/variancegamma.cpp
+++ b/test-suite/variancegamma.cpp
@@ -75,7 +75,7 @@ namespace {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(VarianceGammaExperimentalTest)
+BOOST_AUTO_TEST_SUITE(VarianceGammaTest)
 
 BOOST_AUTO_TEST_CASE(testVarianceGamma) {
 
@@ -250,4 +250,4 @@ BOOST_AUTO_TEST_CASE(testSingularityAtZero) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/varianceoption.cpp b/test-suite/varianceoption.cpp
index aaf9dfa9b5b..f67e482d862 100644
--- a/test-suite/varianceoption.cpp
+++ b/test-suite/varianceoption.cpp
@@ -29,7 +29,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(VarianceOptionExperimentalTest)
+BOOST_AUTO_TEST_SUITE(VarianceOptionTest)
 
 BOOST_AUTO_TEST_CASE(testIntegralHeston) {
 
@@ -115,4 +115,4 @@ BOOST_AUTO_TEST_CASE(testIntegralHeston) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test-suite/vpp.cpp b/test-suite/vpp.cpp
index 43dac086371..71c3df9a75a 100644
--- a/test-suite/vpp.cpp
+++ b/test-suite/vpp.cpp
@@ -236,7 +236,7 @@ namespace vpp_test {
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(VPPExperimentalTest)
+BOOST_AUTO_TEST_SUITE(VppTest)
 
 BOOST_AUTO_TEST_CASE(testGemanRoncoroniProcess) {
 
diff --git a/test-suite/zabr.cpp b/test-suite/zabr.cpp
index bfaa12e77e5..c0c4b6e00b6 100644
--- a/test-suite/zabr.cpp
+++ b/test-suite/zabr.cpp
@@ -28,7 +28,7 @@ using namespace boost::unit_test_framework;
 
 BOOST_FIXTURE_TEST_SUITE(QuantLibTest, TopLevelFixture)
 
-BOOST_AUTO_TEST_SUITE(ZabrExperimentalTest)
+BOOST_AUTO_TEST_SUITE(ZabrTest)
 
 BOOST_AUTO_TEST_CASE(testConsistency, *precondition(if_speed(Slow))) {
     BOOST_TEST_MESSAGE("Testing the consistency of ZABR interpolation...");
@@ -93,4 +93,4 @@ BOOST_AUTO_TEST_CASE(testConsistency, *precondition(if_speed(Slow))) {
 
 BOOST_AUTO_TEST_SUITE_END()
 
-BOOST_AUTO_TEST_SUITE_END()
\ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()