diff --git a/Tests/MaterialLib/MFront.cpp b/Tests/MaterialLib/MFront.cpp
index 2b5847be01eed187a93b418741e43ed34a68ce12..83ea6f77df2a2e701e3e423d75726bb2d3f24640 100644
--- a/Tests/MaterialLib/MFront.cpp
+++ b/Tests/MaterialLib/MFront.cpp
@@ -157,8 +157,8 @@ using TestBehaviourTypes =
     ::testing::Types<StandardElasticityBrickBehaviour<Dim>,
                      ElasticBehaviour<Dim>, MohrCoulombAbboSloanBehaviour<Dim>>;
 
-TYPED_TEST_CASE(MaterialLib_SolidModelsMFront2, TestBehaviourTypes<2>);
-TYPED_TEST_CASE(MaterialLib_SolidModelsMFront3, TestBehaviourTypes<3>);
+TYPED_TEST_SUITE(MaterialLib_SolidModelsMFront2, TestBehaviourTypes<2>);
+TYPED_TEST_SUITE(MaterialLib_SolidModelsMFront3, TestBehaviourTypes<3>);
 
 TYPED_TEST(MaterialLib_SolidModelsMFront2, IntegrateZeroDisplacement)
 {
diff --git a/Tests/MathLib/TestNonlinear1D.cpp b/Tests/MathLib/TestNonlinear1D.cpp
index 221d9c038379e7c93af229cf2bd599a26e1f866f..c076a12e95995b09fa777fbdc17ac6b47c49a276 100644
--- a/Tests/MathLib/TestNonlinear1D.cpp
+++ b/Tests/MathLib/TestNonlinear1D.cpp
@@ -26,7 +26,7 @@ class MathLibRegulaFalsi : public ::testing::Test
 namespace NL = MathLib::Nonlinear;
 using RegulaFalsiTypes = ::testing::Types<NL::Unmodified, NL::Illinois, NL::Pegasus, NL::AndersonBjorck>;
 
-TYPED_TEST_CASE(MathLibRegulaFalsi, RegulaFalsiTypes);
+TYPED_TEST_SUITE(MathLibRegulaFalsi, RegulaFalsiTypes);
 
 TYPED_TEST(MathLibRegulaFalsi, QuadraticFunction)
 {
diff --git a/Tests/NumLib/TestCoordinatesMapping.cpp b/Tests/NumLib/TestCoordinatesMapping.cpp
index 46f1134604e0bf2703d9f25279526c8fc3bb3109..663a6d455d36a131b796ed2df8107c70b0194416 100644
--- a/Tests/NumLib/TestCoordinatesMapping.cpp
+++ b/Tests/NumLib/TestCoordinatesMapping.cpp
@@ -107,7 +107,7 @@ public:
     ElementType* zeroVolumeEle;
 };
 
-TYPED_TEST_CASE(NumLibFemNaturalCoordinatesMappingTest, TestTypes);
+TYPED_TEST_SUITE(NumLibFemNaturalCoordinatesMappingTest, TestTypes);
 
 TYPED_TEST(NumLibFemNaturalCoordinatesMappingTest, CheckFieldSpecification_N)
 {
diff --git a/Tests/NumLib/TestFe.cpp b/Tests/NumLib/TestFe.cpp
index 40bd7bb9dd65a1879e0b417bca7e6392082c5f0e..65b65c9dd23216fe3fe876a5d8848d79190785f1 100644
--- a/Tests/NumLib/TestFe.cpp
+++ b/Tests/NumLib/TestFe.cpp
@@ -185,7 +185,7 @@ const unsigned NumLibFemIsoTest<T>::n_sample_pt_order2;
 template <class T>
 const unsigned NumLibFemIsoTest<T>::n_sample_pt_order3;
 
-TYPED_TEST_CASE(NumLibFemIsoTest, TestTypes);
+TYPED_TEST_SUITE(NumLibFemIsoTest, TestTypes);
 
 TYPED_TEST(NumLibFemIsoTest, CheckMassMatrix)
 {
diff --git a/Tests/NumLib/TestGradShapeFunction.cpp b/Tests/NumLib/TestGradShapeFunction.cpp
index 53cbfbef2546cd692a5b1275fae69e41e9a40307..5689bf1cf2f9dd01fb2c8388999eb767ff8d8c77 100644
--- a/Tests/NumLib/TestGradShapeFunction.cpp
+++ b/Tests/NumLib/TestGradShapeFunction.cpp
@@ -169,7 +169,7 @@ const unsigned GradShapeFunctionTest<T>::n_sample_pt_order2;
 template <class T>
 const unsigned GradShapeFunctionTest<T>::n_sample_pt_order3;
 
-TYPED_TEST_CASE(GradShapeFunctionTest, TestTypes);
+TYPED_TEST_SUITE(GradShapeFunctionTest, TestTypes);
 
 TYPED_TEST(GradShapeFunctionTest,
            CheckGradShapeFunctionByComputingElementVolume)
diff --git a/Tests/NumLib/TestODEInt.cpp b/Tests/NumLib/TestODEInt.cpp
index 465a2558fba682e107236fe4d099fcac00a34bdb..d7fa999d1d02b4b9630d27b9795021868adb8186 100644
--- a/Tests/NumLib/TestODEInt.cpp
+++ b/Tests/NumLib/TestODEInt.cpp
@@ -234,7 +234,7 @@ public:
     }
 };
 
-TYPED_TEST_CASE(NumLibODEIntTyped, TestCases);
+TYPED_TEST_SUITE(NumLibODEIntTyped, TestCases);
 
 // Temporarily disabled for PETSc issue #1989
 #ifndef USE_PETSC
diff --git a/Tests/NumLib/TestSerialExecutor.cpp b/Tests/NumLib/TestSerialExecutor.cpp
index 45254bd30d8ca410c559dcf54dd40fd37416b9da..b114c658751fa02f40eb5857b3a32d2b5fa236b0 100644
--- a/Tests/NumLib/TestSerialExecutor.cpp
+++ b/Tests/NumLib/TestSerialExecutor.cpp
@@ -72,7 +72,7 @@ public:
 
 using TestCases = ::testing::Types<int>;
 
-TYPED_TEST_CASE(NumLibSerialExecutor, TestCases);
+TYPED_TEST_SUITE(NumLibSerialExecutor, TestCases);
 
 TYPED_TEST(NumLibSerialExecutor, ContainerArgument)
 {
diff --git a/Tests/NumLib/TestShapeFunctions.cpp b/Tests/NumLib/TestShapeFunctions.cpp
index 2c61c5b7c400946aa4f807ea5246bf58508fc3e2..aca35e3a76624f8738d364097423c69af2217f49 100644
--- a/Tests/NumLib/TestShapeFunctions.cpp
+++ b/Tests/NumLib/TestShapeFunctions.cpp
@@ -105,7 +105,7 @@ using ShapeFunctionTestTypes =
                      ShapeTet10, ShapeQuad4, ShapeQuad8, ShapeQuad9, ShapeHex8,
                      ShapeHex20>;
 
-TYPED_TEST_CASE(ShapeFunctionTest, ShapeFunctionTestTypes);
+TYPED_TEST_SUITE(ShapeFunctionTest, ShapeFunctionTestTypes);
 
 // TypeParam is the type of the ShapeFunction.
 // Access private members via this pointer or TestFixture:: for types
diff --git a/Tests/ProcessLib/TestJacobianAssembler.cpp b/Tests/ProcessLib/TestJacobianAssembler.cpp
index 5967d69d43f4cc65c1d63eccd171d243b18ddb5a..a2a1483ff4ac5301a1c38be59913e0b545a39438 100644
--- a/Tests/ProcessLib/TestJacobianAssembler.cpp
+++ b/Tests/ProcessLib/TestJacobianAssembler.cpp
@@ -602,7 +602,7 @@ using TestCases = ::testing::Types<
     LocalAssemblerMKb<MatVecXSquaredShifted, MatVecXSquaredShifted,
                       MatVecXSquaredShifted>>;
 
-TYPED_TEST_CASE(ProcessLibCentralDifferencesJacobianAssembler, TestCases);
+TYPED_TEST_SUITE(ProcessLibCentralDifferencesJacobianAssembler, TestCases);
 
 TYPED_TEST(ProcessLibCentralDifferencesJacobianAssembler, Test)
 {