diff --git a/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp b/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp
index 3b1cd12645..75f3cae0e3 100644
--- a/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp
+++ b/testing/adios2/bindings/C/TestBPWriteAggregateReadLocal.cpp
@@ -362,7 +362,7 @@ TEST_P(BPWriteAggregateReadLocalTest, Aggregate1DBlock0)
     LocalAggregate1DBlock0(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(Substreams, BPWriteAggregateReadLocalTest,
+INSTANTIATE_TEST_SUITE_P(Substreams, BPWriteAggregateReadLocalTest,
                         ::testing::Values("1", "2", "3", "4"));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/bp/TestBPStepsFileGlobalArray.cpp b/testing/adios2/engine/bp/TestBPStepsFileGlobalArray.cpp
index 5eac4f6b1e..bf5317116a 100644
--- a/testing/adios2/engine/bp/TestBPStepsFileGlobalArray.cpp
+++ b/testing/adios2/engine/bp/TestBPStepsFileGlobalArray.cpp
@@ -580,7 +580,7 @@ TEST_P(BPStepsFileGlobalArrayReaders, NewVarPerStep)
 #endif
 }
 
-INSTANTIATE_TEST_CASE_P(BPStepsFileGlobalArray, BPStepsFileGlobalArrayReaders,
+INSTANTIATE_TEST_SUITE_P(BPStepsFileGlobalArray, BPStepsFileGlobalArrayReaders,
                         ::testing::Values(ReadMode::ReadFileAll,
                                           ReadMode::ReadFileStepByStep,
                                           ReadMode::ReadFileStepByStepBlocks,
@@ -867,7 +867,7 @@ TEST_P(BPStepsFileGlobalArrayParameters, EveryOtherStep)
 #endif
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BPStepsFileGlobalArray, BPStepsFileGlobalArrayParameters,
     ::testing::Values(std::make_tuple(4, 0, ReadMode::ReadFileAll),
                       std::make_tuple(4, 0, ReadMode::ReadFileStepByStep),
diff --git a/testing/adios2/engine/bp/TestBPStepsFileLocalArray.cpp b/testing/adios2/engine/bp/TestBPStepsFileLocalArray.cpp
index e51f309b71..e15cdb4072 100644
--- a/testing/adios2/engine/bp/TestBPStepsFileLocalArray.cpp
+++ b/testing/adios2/engine/bp/TestBPStepsFileLocalArray.cpp
@@ -389,7 +389,7 @@ TEST_P(BPStepsFileLocalArrayReaders, NewVarPerStep)
 #endif
 }
 
-INSTANTIATE_TEST_CASE_P(BPStepsFileLocalArray, BPStepsFileLocalArrayReaders,
+INSTANTIATE_TEST_SUITE_P(BPStepsFileLocalArray, BPStepsFileLocalArrayReaders,
                         ::testing::Values(ReadMode::ReadFileStepByStepBlocks,
                                           ReadMode::ReadStreamBlocks));
 
@@ -574,7 +574,7 @@ TEST_P(BPStepsFileLocalArrayParameters, EveryOtherStep)
 #endif
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BPStepsFileLocalArray, BPStepsFileLocalArrayParameters,
     ::testing::Values(std::make_tuple(4, 0, ReadMode::ReadFileStepByStepBlocks),
                       std::make_tuple(4, 0, ReadMode::ReadStreamBlocks),
diff --git a/testing/adios2/engine/bp/TestBPStepsInSituGlobalArray.cpp b/testing/adios2/engine/bp/TestBPStepsInSituGlobalArray.cpp
index 155b6b571f..92e2083c71 100644
--- a/testing/adios2/engine/bp/TestBPStepsInSituGlobalArray.cpp
+++ b/testing/adios2/engine/bp/TestBPStepsInSituGlobalArray.cpp
@@ -441,7 +441,7 @@ TEST_P(BPStepsInSituGlobalArrayReaders, NewVarPerStep)
     reader.Close();
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BPStepsInSituGlobalArray, BPStepsInSituGlobalArrayReaders,
     ::testing::Values(std::make_tuple(0, ReadMode::ReadGlobal),
                       std::make_tuple(1, ReadMode::ReadGlobal),
@@ -649,7 +649,7 @@ TEST_P(BPStepsInSituGlobalArrayParameters, EveryOtherStep)
     reader.Close();
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BPStepsInSituGlobalArray, BPStepsInSituGlobalArrayParameters,
     ::testing::Values(std::make_tuple(0, 0, ReadMode::ReadGlobal),
                       std::make_tuple(0, 0, ReadMode::ReadBlocks),
diff --git a/testing/adios2/engine/bp/TestBPStepsInSituLocalArray.cpp b/testing/adios2/engine/bp/TestBPStepsInSituLocalArray.cpp
index d327c21d5a..90d42a9e82 100644
--- a/testing/adios2/engine/bp/TestBPStepsInSituLocalArray.cpp
+++ b/testing/adios2/engine/bp/TestBPStepsInSituLocalArray.cpp
@@ -357,7 +357,7 @@ TEST_P(BPStepsInSituLocalArrayReaders, NewVarPerStep)
     reader.Close();
 }
 
-INSTANTIATE_TEST_CASE_P(BPStepsInSituLocalArray, BPStepsInSituLocalArrayReaders,
+INSTANTIATE_TEST_SUITE_P(BPStepsInSituLocalArray, BPStepsInSituLocalArrayReaders,
                         ::testing::Values(0, 1, 2, 3, 4));
 
 class BPStepsInSituLocalArrayParameters
@@ -516,7 +516,7 @@ TEST_P(BPStepsInSituLocalArrayParameters, EveryOtherStep)
     reader.Close();
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BPStepsInSituLocalArray, BPStepsInSituLocalArrayParameters,
     ::testing::Values(std::make_tuple(0, 0), std::make_tuple(0, 1),
                       std::make_tuple(1, 0), std::make_tuple(1, 1),
diff --git a/testing/adios2/engine/bp/TestBPTimeAggregation.cpp b/testing/adios2/engine/bp/TestBPTimeAggregation.cpp
index c5bed38fe1..6e672dfab1 100644
--- a/testing/adios2/engine/bp/TestBPTimeAggregation.cpp
+++ b/testing/adios2/engine/bp/TestBPTimeAggregation.cpp
@@ -665,7 +665,7 @@ TEST_P(BPTestTimeAggregation, BPTimeAggregation2D4x2)
     TimeAggregation2D4x2(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(FlushStepsCount, BPTestTimeAggregation,
+INSTANTIATE_TEST_SUITE_P(FlushStepsCount, BPTestTimeAggregation,
                         ::testing::Values("1", "2", "3", "6", "8", "10"));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/bp/TestBPWriteAggregateRead.cpp b/testing/adios2/engine/bp/TestBPWriteAggregateRead.cpp
index b9acd3762d..3a2dd3fa28 100644
--- a/testing/adios2/engine/bp/TestBPWriteAggregateRead.cpp
+++ b/testing/adios2/engine/bp/TestBPWriteAggregateRead.cpp
@@ -953,7 +953,7 @@ TEST_P(BPWriteAggregateReadTest, ADIOS2BPWriteAggregateRead2D4x2)
     WriteAggRead2D4x2(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(Substreams, BPWriteAggregateReadTest,
+INSTANTIATE_TEST_SUITE_P(Substreams, BPWriteAggregateReadTest,
                         ::testing::Values("1", "2", "3", "4", "5"));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp b/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp
index f71084900e..2aa40262da 100644
--- a/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp
+++ b/testing/adios2/engine/bp/TestBPWriteMemorySelectionRead.cpp
@@ -968,7 +968,7 @@ TEST_P(BPWriteMemSelReadVector, BPMemorySelectionSteps3D4x2x8)
     BPSteps3D8x2x4(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(ghostCells, BPWriteMemSelReadVector,
+INSTANTIATE_TEST_SUITE_P(ghostCells, BPWriteMemSelReadVector,
                         ::testing::Values(1));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadBZIP2.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadBZIP2.cpp
index ce5898c9d0..afd205e6e4 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadBZIP2.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadBZIP2.cpp
@@ -878,7 +878,7 @@ TEST_P(BPWriteReadBZIP2, ADIOS2BPWriteReadBZIP23DSel)
     BZIP2Accuracy3DSel(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     BZIP2Accuracy, BPWriteReadBZIP2,
     ::testing::Values(adios2::ops::bzip2::value::blockSize100k_1,
                       adios2::ops::bzip2::value::blockSize100k_2,
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadBlosc.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadBlosc.cpp
index 01a0acbf69..ff0aef11cb 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadBlosc.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadBlosc.cpp
@@ -878,7 +878,7 @@ TEST_P(BPWriteReadBlosc, ADIOS2BPWriteReadBlosc3DSel)
     BloscAccuracy3DSel(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(BloscAccuracy, BPWriteReadBlosc,
+INSTANTIATE_TEST_SUITE_P(BloscAccuracy, BPWriteReadBlosc,
                         ::testing::Values(adios2::ops::blosc::value::clevel_1,
                                           adios2::ops::blosc::value::clevel_2,
                                           adios2::ops::blosc::value::clevel_3,
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadMGARD.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadMGARD.cpp
index 1481a67c56..eb154a3097 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadMGARD.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadMGARD.cpp
@@ -997,7 +997,7 @@ TEST_P(BPWriteReadMGARD, BPWRMGARD2D) { MGARDAccuracy2D(GetParam()); }
 
 TEST_P(BPWriteReadMGARD, BPWRMGARD3D) { MGARDAccuracy3D(GetParam()); }
 
-INSTANTIATE_TEST_CASE_P(MGARDAccuracy, BPWriteReadMGARD,
+INSTANTIATE_TEST_SUITE_P(MGARDAccuracy, BPWriteReadMGARD,
                         ::testing::Values("0.01", "0.001", "0.0001",
                                           "0.00001"));
 
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadPNG.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadPNG.cpp
index 6cc1e49757..63443cbd39 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadPNG.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadPNG.cpp
@@ -438,7 +438,7 @@ class BPWRPNG : public ::testing::TestWithParam<std::string>
 
 TEST_P(BPWRPNG, BPWRPNG2D) { PNGAccuracy2D(GetParam()); }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     PNGAccuracy, BPWRPNG,
     ::testing::Values(adios2::ops::png::value::compression_level_1,
                       adios2::ops::png::value::compression_level_2,
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadSZ.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadSZ.cpp
index d93031ea76..1709e6997c 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadSZ.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadSZ.cpp
@@ -1035,7 +1035,7 @@ TEST_P(BPWriteReadSZ, BPWRSZ2DSel) { SZAccuracy2DSel(GetParam()); }
 TEST_P(BPWriteReadSZ, BPWRSZ3DSel) { SZAccuracy3DSel(GetParam()); }
 TEST_F(BPWriteReadSZ, BPWRSZ2DSmallSel) { SZAccuracy2DSmallSel("0.01"); }
 
-INSTANTIATE_TEST_CASE_P(SZAccuracy, BPWriteReadSZ,
+INSTANTIATE_TEST_SUITE_P(SZAccuracy, BPWriteReadSZ,
                         ::testing::Values("0.01", "0.001", "0.0001",
                                           "0.00001"));
 
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadZfp.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadZfp.cpp
index ab7ce3ea36..e2b7931d46 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadZfp.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadZfp.cpp
@@ -960,7 +960,7 @@ TEST_P(BPWRZFP, ADIOS2BPWRZFP2DSel) { ZFPRate2DSel(GetParam()); }
 TEST_P(BPWRZFP, ADIOS2BPWRZFP3DSel) { ZFPRate3DSel(GetParam()); }
 TEST_P(BPWRZFP, ADIOS2BPWRZFP2DSmallSel) { ZFPRate2DSmallSel(GetParam()); }
 
-INSTANTIATE_TEST_CASE_P(ZFPRate, BPWRZFP, ::testing::Values("8", "9", "10"));
+INSTANTIATE_TEST_SUITE_P(ZFPRate, BPWRZFP, ::testing::Values("8", "9", "10"));
 
 int main(int argc, char **argv)
 {
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadZfpConfig.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadZfpConfig.cpp
index 64adbd0480..5adcc94a25 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadZfpConfig.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadZfpConfig.cpp
@@ -876,7 +876,7 @@ TEST_P(BPWriteReadZfpConfig, ADIOS2BPWriteReadZfp2DSmallSel)
     ZfpRate2DSmallSel(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     ZfpConfigFile, BPWriteReadZfpConfig,
     ::testing::Values("configZfp_rate8.xml", "configZfp_rate8Simple.xml",
                       "configZfp_rate9.xml", "configZfp_rate9Simple.xml",
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadZfpHighLevelAPI.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadZfpHighLevelAPI.cpp
index 21ab379dcc..d3f6ec1193 100644
--- a/testing/adios2/engine/bp/operations/TestBPWriteReadZfpHighLevelAPI.cpp
+++ b/testing/adios2/engine/bp/operations/TestBPWriteReadZfpHighLevelAPI.cpp
@@ -722,7 +722,7 @@ TEST_P(BPWriteReadZfpHighLevelAPI, ADIOS2BPWriteReadZfp2DSmallSel)
     ZfpRate2DSmallSel(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(ZfpRate, BPWriteReadZfpHighLevelAPI,
+INSTANTIATE_TEST_SUITE_P(ZfpRate, BPWriteReadZfpHighLevelAPI,
                         ::testing::Values(8., 9., 10));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/hdf5/TestHDF5WriteMemorySelectionRead.cpp b/testing/adios2/engine/hdf5/TestHDF5WriteMemorySelectionRead.cpp
index 9e90b2d2b9..dfc21f7421 100644
--- a/testing/adios2/engine/hdf5/TestHDF5WriteMemorySelectionRead.cpp
+++ b/testing/adios2/engine/hdf5/TestHDF5WriteMemorySelectionRead.cpp
@@ -924,7 +924,7 @@ TEST_P(HDF5WriteMemSelReadVector, HDF5MemorySelectionSteps3D4x2x8)
     HDF5Steps3D8x2x4(GetParam());
 }
 
-INSTANTIATE_TEST_CASE_P(ghostCells, HDF5WriteMemSelReadVector,
+INSTANTIATE_TEST_SUITE_P(ghostCells, HDF5WriteMemSelReadVector,
                         ::testing::Values(1));
 
 int main(int argc, char **argv)
diff --git a/testing/adios2/engine/staging-common/TestStagingMPMD.cpp b/testing/adios2/engine/staging-common/TestStagingMPMD.cpp
index e9e10ce739..a2c2b2907f 100644
--- a/testing/adios2/engine/staging-common/TestStagingMPMD.cpp
+++ b/testing/adios2/engine/staging-common/TestStagingMPMD.cpp
@@ -40,7 +40,7 @@ struct RunParams
     : npx_w{xw}, npy_w{yw}, npx_r{xr}, npy_r{yr} {};
 };
 
-/* This function is executed by INSTANTIATE_TEST_CASE_P
+/* This function is executed by INSTANTIATE_TEST_SUITE_P
    before main() and MPI_Init()!!! */
 std::vector<RunParams> CreateRunParams()
 {
@@ -346,7 +346,7 @@ TEST_P(TestStagingMPMD, SlowReader)
     TestCommon(p, 4, 0, 100, -1.0);
 }
 
-INSTANTIATE_TEST_CASE_P(NxM, TestStagingMPMD,
+INSTANTIATE_TEST_SUITE_P(NxM, TestStagingMPMD,
                         ::testing::ValuesIn(CreateRunParams()));
 
 void threadTimeoutRun(size_t t)
diff --git a/testing/adios2/performance/manyvars/TestManyVars.cpp b/testing/adios2/performance/manyvars/TestManyVars.cpp
index d9ef1d85a5..b59c7f420e 100644
--- a/testing/adios2/performance/manyvars/TestManyVars.cpp
+++ b/testing/adios2/performance/manyvars/TestManyVars.cpp
@@ -45,7 +45,7 @@ struct RunParams
     : nvars{nv}, nblocks{nb}, nsteps{ns} {};
 };
 
-/* This function is executed by INSTANTIATE_TEST_CASE_P
+/* This function is executed by INSTANTIATE_TEST_SUITE_P
    before main() and MPI_Init()!!! */
 std::vector<RunParams> CreateRunParams()
 {
@@ -479,7 +479,7 @@ TEST_P(TestManyVars, DontRedefineVars)
     ASSERT_EQ(err, 0);
 }
 
-INSTANTIATE_TEST_CASE_P(NxM, TestManyVars,
+INSTANTIATE_TEST_SUITE_P(NxM, TestManyVars,
                         ::testing::ValuesIn(CreateRunParams()));
 
 //******************************************************************************
diff --git a/testing/adios2/transports/TestFile.cpp b/testing/adios2/transports/TestFile.cpp
index fe341348c7..dc1b5429c4 100644
--- a/testing/adios2/transports/TestFile.cpp
+++ b/testing/adios2/transports/TestFile.cpp
@@ -76,7 +76,7 @@ TEST_P(BufferTest, WriteRead)
 }
 
 #ifdef __unix__
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     TransportTests, BufferTest,
     ::testing::Values(std::make_tuple("fstream", "true", "posix", "false"),
                       std::make_tuple("fstream", "false", "posix", "false"),
@@ -106,7 +106,7 @@ INSTANTIATE_TEST_CASE_P(
                       std::make_tuple("fstream", "false", "fstream", "true"),
                       std::make_tuple("fstream", "false", "fstream", "false")));
 #else
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     TransportTests, BufferTest,
     ::testing::Values(std::make_tuple("stdio", "true", "stdio", "true"),
                       std::make_tuple("stdio", "true", "stdio", "false"),