diff --git a/src/UnitTests/Containers/ArrayOperationsTest.h b/src/UnitTests/Containers/ArrayOperationsTest.h
index 9487475418914432a52648ff3957477f2049627f..23b8fcd4ebfef2dfd36b75582cd2b14652988abd 100644
--- a/src/UnitTests/Containers/ArrayOperationsTest.h
+++ b/src/UnitTests/Containers/ArrayOperationsTest.h
@@ -32,7 +32,7 @@ protected:
 // types for which ArrayTest is instantiated
 using ValueTypes = ::testing::Types< short int, int, long, float, double >;
 
-TYPED_TEST_CASE( ArrayOperationsTest, ValueTypes );
+TYPED_TEST_SUITE( ArrayOperationsTest, ValueTypes );
 
 TYPED_TEST( ArrayOperationsTest, allocateMemory_host )
 {
diff --git a/src/UnitTests/Containers/ArrayTest.h b/src/UnitTests/Containers/ArrayTest.h
index 9e4b1f572d2ffd98de22fdca495a0ba4aa56f0a8..d2bddbd29640e87f3c8bd3029a5c5e05a5e42cc4 100644
--- a/src/UnitTests/Containers/ArrayTest.h
+++ b/src/UnitTests/Containers/ArrayTest.h
@@ -139,7 +139,7 @@ using ArrayTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( ArrayTest, ArrayTypes );
+TYPED_TEST_SUITE( ArrayTest, ArrayTypes );
 
 
 TYPED_TEST( ArrayTest, constructors )
diff --git a/src/UnitTests/Containers/ArrayViewTest.h b/src/UnitTests/Containers/ArrayViewTest.h
index ccc9ba9f03c0aa7145473c03f46ae3014147e35a..7f3cc7bb338f8178b44fea3275feceabb709dd2f 100644
--- a/src/UnitTests/Containers/ArrayViewTest.h
+++ b/src/UnitTests/Containers/ArrayViewTest.h
@@ -142,7 +142,7 @@ using ViewTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( ArrayViewTest, ViewTypes );
+TYPED_TEST_SUITE( ArrayViewTest, ViewTypes );
 
 
 TYPED_TEST( ArrayViewTest, constructors )
diff --git a/src/UnitTests/Containers/DistributedArrayTest.h b/src/UnitTests/Containers/DistributedArrayTest.h
index 541c0766cfd80936f27853f48e55787905280f6f..15ed6214a1d0ef4f74a8fec6dfdf1a24ff31851d 100644
--- a/src/UnitTests/Containers/DistributedArrayTest.h
+++ b/src/UnitTests/Containers/DistributedArrayTest.h
@@ -69,7 +69,7 @@ using DistributedArrayTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( DistributedArrayTest, DistributedArrayTypes );
+TYPED_TEST_SUITE( DistributedArrayTest, DistributedArrayTypes );
 
 TYPED_TEST( DistributedArrayTest, checkSumOfLocalSizes )
 {
diff --git a/src/UnitTests/Containers/DistributedVectorTest.h b/src/UnitTests/Containers/DistributedVectorTest.h
index 6ff92375c098a2ea1574f5b1e5f4e93be64d7138..870446d15a39a0543f4a33f9b05b5f679d15272f 100644
--- a/src/UnitTests/Containers/DistributedVectorTest.h
+++ b/src/UnitTests/Containers/DistributedVectorTest.h
@@ -112,7 +112,7 @@ using DistributedVectorTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( DistributedVectorTest, DistributedVectorTypes );
+TYPED_TEST_SUITE( DistributedVectorTest, DistributedVectorTypes );
 
 TYPED_TEST( DistributedVectorTest, max )
 {
diff --git a/src/UnitTests/Containers/MultireductionTest.h b/src/UnitTests/Containers/MultireductionTest.h
index 7f3c26fc46c440bdc117f85ea4bd0dbc85a96d99..d0aa7bd84d536480581d2bdc9023b81fe174680d 100644
--- a/src/UnitTests/Containers/MultireductionTest.h
+++ b/src/UnitTests/Containers/MultireductionTest.h
@@ -92,7 +92,7 @@ using VectorTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( MultireductionTest, VectorTypes );
+TYPED_TEST_SUITE( MultireductionTest, VectorTypes );
 
 TYPED_TEST( MultireductionTest, scalarProduct )
 {
diff --git a/src/UnitTests/Containers/VectorTest.h b/src/UnitTests/Containers/VectorTest.h
index 05df280d64dfaab839f38e0813c624e13fa359b1..5f84245165145e32a784e6c9792ec2f33361e21d 100644
--- a/src/UnitTests/Containers/VectorTest.h
+++ b/src/UnitTests/Containers/VectorTest.h
@@ -143,7 +143,7 @@ using VectorTypes = ::testing::Types<
 #endif
 >;
 
-TYPED_TEST_CASE( VectorTest, VectorTypes );
+TYPED_TEST_SUITE( VectorTest, VectorTypes );
 
 
 TYPED_TEST( VectorTest, max )