diff --git a/src/EmbeddingSpMDM.cc b/src/EmbeddingSpMDM.cc
index d10b251a90..20efa0e912 100644
--- a/src/EmbeddingSpMDM.cc
+++ b/src/EmbeddingSpMDM.cc
@@ -319,7 +319,7 @@ GenEmbeddingSpMDMLookup<
 
         if constexpr (ROWWISE_SPARSE) {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
@@ -334,7 +334,7 @@ GenEmbeddingSpMDMLookup<
               a->environment());
         } else {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
diff --git a/src/EmbeddingSpMDMNBit.cc b/src/EmbeddingSpMDMNBit.cc
index 53a5834153..40792ce6bd 100644
--- a/src/EmbeddingSpMDMNBit.cc
+++ b/src/EmbeddingSpMDMNBit.cc
@@ -290,7 +290,7 @@ GenEmbeddingSpMDMNBitLookup<
 
         if constexpr (ROWWISE_SPARSE) {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
@@ -305,7 +305,7 @@ GenEmbeddingSpMDMNBitLookup<
               a->environment());
         } else {
           func.init(
-              asmjit::FuncSignatureT<
+              asmjit::FuncSignature::build<
                   bool,
                   int64_t, // output_size
                   int64_t, // index_size
diff --git a/src/FbgemmI64.cc b/src/FbgemmI64.cc
index 31cc8d0dca..a41eb0384d 100644
--- a/src/FbgemmI64.cc
+++ b/src/FbgemmI64.cc
@@ -178,7 +178,7 @@ CodeGenBase<int64_t, int64_t, int64_t, int64_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             int64_t*,
             int64_t*,
diff --git a/src/GenerateI8Depthwise.cc b/src/GenerateI8Depthwise.cc
index dcfda587f7..a4091ade46 100644
--- a/src/GenerateI8Depthwise.cc
+++ b/src/GenerateI8Depthwise.cc
@@ -262,7 +262,7 @@ GenI8Depthwise::jit_kernel_signature GenI8Depthwise::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             const std::uint8_t*,
             const std::int8_t*,
diff --git a/src/GenerateKernelDirectConvU8S8S32ACC32.cc b/src/GenerateKernelDirectConvU8S8S32ACC32.cc
index e565d4156b..e78bc8b997 100644
--- a/src/GenerateKernelDirectConvU8S8S32ACC32.cc
+++ b/src/GenerateKernelDirectConvU8S8S32ACC32.cc
@@ -226,7 +226,7 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreateDirectConv(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
@@ -650,7 +650,7 @@ DirectConvCodeGenBase<uint8_t, int8_t, int32_t, int32_t>::
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
diff --git a/src/GenerateKernelU8S8S32ACC16.cc b/src/GenerateKernelU8S8S32ACC16.cc
index 0384ffb9ed..473e3bb22a 100644
--- a/src/GenerateKernelU8S8S32ACC16.cc
+++ b/src/GenerateKernelU8S8S32ACC16.cc
@@ -180,7 +180,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate<inst_set_t::avx2>(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
diff --git a/src/GenerateKernelU8S8S32ACC16Avx512.cc b/src/GenerateKernelU8S8S32ACC16Avx512.cc
index 50b1b12a7d..a0ad48a668 100644
--- a/src/GenerateKernelU8S8S32ACC16Avx512.cc
+++ b/src/GenerateKernelU8S8S32ACC16Avx512.cc
@@ -142,7 +142,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int16_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
diff --git a/src/GenerateKernelU8S8S32ACC32.cc b/src/GenerateKernelU8S8S32ACC32.cc
index a0f22ea8b5..4f192b3bfc 100644
--- a/src/GenerateKernelU8S8S32ACC32.cc
+++ b/src/GenerateKernelU8S8S32ACC32.cc
@@ -179,7 +179,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
diff --git a/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc b/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
index fb35171fe6..aa07bec5c4 100644
--- a/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
+++ b/src/GenerateKernelU8S8S32ACC32Avx512VNNI.cc
@@ -133,7 +133,7 @@ CodeGenBase<uint8_t, int8_t, int32_t, int32_t>::getOrCreate(
 
     asmjit::FuncDetail func;
     func.init(
-        asmjit::FuncSignatureT<
+        asmjit::FuncSignature::build<
             void,
             uint8_t*,
             int8_t*,
diff --git a/src/GroupwiseConv.cc b/src/GroupwiseConv.cc
index b973161620..f6536103ee 100644
--- a/src/GroupwiseConv.cc
+++ b/src/GroupwiseConv.cc
@@ -217,7 +217,7 @@ jit_conv_kernel_fp GenConvKernel<SPATIAL_DIM, INST_SET>::getOrCreate() {
   scratchReg2_ = a->gpz(13);
 
   func_.init(
-      asmjit::FuncSignatureT<
+      asmjit::FuncSignature::build<
           void,
           uint8_t*,
           int8_t*,
diff --git a/src/RowWiseSparseAdagradFused.cc b/src/RowWiseSparseAdagradFused.cc
index 113e25c6e2..6289cfac4f 100644
--- a/src/RowWiseSparseAdagradFused.cc
+++ b/src/RowWiseSparseAdagradFused.cc
@@ -168,7 +168,7 @@ typename ReturnFunctionSignature<indxType, offsetType, dataType>::
 
         asmjit::FuncDetail func;
         func.init(
-            asmjit::FuncSignatureT<
+            asmjit::FuncSignature::build<
                 bool, // return type
                 int64_t, // output_size
                 int64_t, // index_size
diff --git a/src/SparseAdagrad.cc b/src/SparseAdagrad.cc
index ce42201946..c489e2c566 100644
--- a/src/SparseAdagrad.cc
+++ b/src/SparseAdagrad.cc
@@ -500,7 +500,7 @@ GenSparseAdagrad<indxType, instSet>::getOrCreate(
 
         asmjit::FuncDetail func;
         func.init(
-            asmjit::FuncSignatureT<
+            asmjit::FuncSignature::build<
                 int, // return type
                 int, // num rows
                 std::uint64_t, // param_size
diff --git a/test/EmbeddingSpMDM8BitTest.cc b/test/EmbeddingSpMDM8BitTest.cc
index 514de02ceb..cba5eee39d 100644
--- a/test/EmbeddingSpMDM8BitTest.cc
+++ b/test/EmbeddingSpMDM8BitTest.cc
@@ -58,7 +58,7 @@ class Fused8BitRowwiseEmbeddingLookupTest
           EmbeddingSpMDMOutputDtypeChoice>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     Fused8BitRowwiseEmbeddingLookupTest,
     ::testing::Combine(
diff --git a/test/EmbeddingSpMDMNBitTest.cc b/test/EmbeddingSpMDMNBitTest.cc
index 5251455f4e..abe99687d3 100644
--- a/test/EmbeddingSpMDMNBitTest.cc
+++ b/test/EmbeddingSpMDMNBitTest.cc
@@ -61,7 +61,7 @@ class FusedNBitRowwiseEmbeddingLookupTest : public testing::TestWithParam<tuple<
                                                 EmbeddingSpMDMDtypeChoice>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FusedNBitRowwiseEmbeddingLookupTest,
     ::testing::Combine(
diff --git a/test/EmbeddingSpMDMTest.cc b/test/EmbeddingSpMDMTest.cc
index e077a64724..29f44437b9 100644
--- a/test/EmbeddingSpMDMTest.cc
+++ b/test/EmbeddingSpMDMTest.cc
@@ -67,7 +67,7 @@ class IndexRemapTest
 
 static vector<int> prefetch_distances = {0, 16, 1000000};
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     EmbeddingSpMDMTest,
     ::testing::Combine(
@@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Values(FLOAT, FLOAT16, BFLOAT16),
         ::testing::Values(FLOAT, FLOAT16, BFLOAT16)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     rowwiseSparseEmbeddingSpMDMTest,
     ::testing::Combine(
@@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P(
             OUT_OF_BOUND_INDICES,
             UNMATCHED_NUM_INDICES_AND_LENGTHS_SUM)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     IndexRemapTest,
     ::testing::Combine(
diff --git a/test/FP16Test.cc b/test/FP16Test.cc
index 45526a676f..eaa69e8a27 100644
--- a/test/FP16Test.cc
+++ b/test/FP16Test.cc
@@ -13,7 +13,7 @@
 
 using FBGemmFP16Test = fbgemm::FBGemmFPTest<fbgemm::float16>;
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFP16Test,
     ::testing::Values(
diff --git a/test/FP32Test.cc b/test/FP32Test.cc
index 69265dcfe2..0bbe28902f 100644
--- a/test/FP32Test.cc
+++ b/test/FP32Test.cc
@@ -20,7 +20,7 @@
 
 using FBGemmFP32Test = fbgemm::FBGemmFPTest<float>;
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFP32Test,
     ::testing::Values(
diff --git a/test/Float16ConvertTest.cc b/test/Float16ConvertTest.cc
index aa549fede4..de902253b8 100644
--- a/test/Float16ConvertTest.cc
+++ b/test/Float16ConvertTest.cc
@@ -21,7 +21,7 @@ namespace {
 class FBGemmFloat16Test : public testing::TestWithParam<bool> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmFloat16Test,
     ::testing::Bool());
diff --git a/test/GConvTest.cc b/test/GConvTest.cc
index c1289e62c8..ef354ce969 100644
--- a/test/GConvTest.cc
+++ b/test/GConvTest.cc
@@ -49,14 +49,14 @@ class fbgemmGConvAcc32WithQuantGranularityTest
 class fbgemmGConvPackTest : public testing::TestWithParam<matrix_op_t> {};
 }; // namespace
 
-// INSTANTIATE_TEST_CASE_P(
+// INSTANTIATE_TEST_SUITE_P(
 //     InstantiationName,
 //     fbgemmGConvAcc32Test,
 //     ::testing::Combine(
 //         ::testing::Values(matrix_op_t::NoTranspose),
 //         ::testing::ValuesIn(transposeVals)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmGConvAcc32WithQuantGranularityTest,
     ::testing::Combine(
@@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(), // A symmetric
         ::testing::Bool())); // B symmetric
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmGConvPackTest,
     ::testing::ValuesIn(transposeVals));
diff --git a/test/I8DepthwiseTest.cc b/test/I8DepthwiseTest.cc
index d9a9349c54..c077c3aee4 100644
--- a/test/I8DepthwiseTest.cc
+++ b/test/I8DepthwiseTest.cc
@@ -107,7 +107,7 @@ class FBGemmDepthWisePackUnpackTest
 
 } // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWiseTest,
     ::testing::Combine(
@@ -115,12 +115,12 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(), // b_symmetric
         ::testing::Values(1, 2))); // oc_per_g
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWisePerChannelQuantizationTest,
     ::testing::Values(1, 2));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDepthWisePackUnpackTest,
     ::testing::Combine(
diff --git a/test/I8DirectconvTest.cc b/test/I8DirectconvTest.cc
index e4261c86ab..264bdb4de8 100644
--- a/test/I8DirectconvTest.cc
+++ b/test/I8DirectconvTest.cc
@@ -248,7 +248,7 @@ static void QuantizeDirectConv_ref(
   }
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTest,
     ::testing::Combine(
@@ -418,7 +418,7 @@ TEST_P(FBGemmDirectConvTest, Test2D) {
 */
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTransTest,
     ::testing::Combine(
@@ -606,7 +606,7 @@ TEST_P(FBGemmDirectConvTransTest, Test2D) {
 }
 
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FBGemmDirectConvTransFbgemmTest,
     ::testing::Combine(
diff --git a/test/I8SpmdmTest.cc b/test/I8SpmdmTest.cc
index 0f89457b41..212be0700c 100644
--- a/test/I8SpmdmTest.cc
+++ b/test/I8SpmdmTest.cc
@@ -35,7 +35,7 @@ class fbgemmSPMDMTest
     : public testing::TestWithParam<std::tuple<float, bool, bool>> {};
 } // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     Instance0,
     fbgemmSPMDMTest,
     ::testing::Combine(
diff --git a/test/Im2ColFusedRequantizeTest.cc b/test/Im2ColFusedRequantizeTest.cc
index 180c967463..0f4bf9e80a 100644
--- a/test/Im2ColFusedRequantizeTest.cc
+++ b/test/Im2ColFusedRequantizeTest.cc
@@ -36,7 +36,7 @@ class fbgemmIm2colTest
     : public testing::TestWithParam<tuple<QuantizationGranularity, bool>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmIm2colTest,
     ::testing::Combine(
diff --git a/test/PackedRequantizeAcc16Test.cc b/test/PackedRequantizeAcc16Test.cc
index cb2eba5c82..434c9fccaf 100644
--- a/test/PackedRequantizeAcc16Test.cc
+++ b/test/PackedRequantizeAcc16Test.cc
@@ -48,7 +48,7 @@ class fbgemmPackUnpackAcc16Test
     : public testing::TestWithParam<tuple<matrix_op_t, bool>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc16WithQuantGranularityTest,
     ::testing::Combine(
@@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(),
         ::testing::ValuesIn(qGranularityVals)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc16Test,
     ::testing::Combine(
@@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn(transposeVals),
         ::testing::Bool()));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmPackUnpackAcc16Test,
     ::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool()));
diff --git a/test/PackedRequantizeTest.cc b/test/PackedRequantizeTest.cc
index f1776f2381..87fbf12a2e 100644
--- a/test/PackedRequantizeTest.cc
+++ b/test/PackedRequantizeTest.cc
@@ -46,7 +46,7 @@ class fbgemmPackUnpackAcc32Test
     : public testing::TestWithParam<tuple<matrix_op_t, bool>> {};
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc32WithQuantGranularityTest,
     ::testing::Combine(
@@ -55,7 +55,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Bool(),
         ::testing::ValuesIn(qGranularityVals)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmu8s8acc32Test,
     ::testing::Combine(
@@ -63,7 +63,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn(transposeVals),
         ::testing::Bool()));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     fbgemmPackUnpackAcc32Test,
     ::testing::Combine(::testing::ValuesIn(transposeVals), ::testing::Bool()));
diff --git a/test/QuantUtilsTest.cc b/test/QuantUtilsTest.cc
index 4460c75b18..b1af644f40 100644
--- a/test/QuantUtilsTest.cc
+++ b/test/QuantUtilsTest.cc
@@ -42,7 +42,7 @@ class EmbeddingQuantizeTest
 class EmbeddingQuantizeSBFloatTest
     : public testing::TestWithParam<tuple<int, int>> {};
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     QuantizeGroupwiseTest,
     ::testing::Combine(
@@ -52,17 +52,17 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn({1, 4}), // G
         ::testing::ValuesIn({layout_t::KCX, layout_t::KXC})));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     QuantizeTest,
     ::testing::Values(1, 2, 5, 8, 9, 16, 20, 28, 32, 33));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FusedQuantizeDequantizeTest,
     ::testing::Values(1, 2, 5, 8, 9, 16, 20, 28, 32, 33));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     EmbeddingQuantizeTest,
     ::testing::Combine(
@@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn({1, 2, 3}),
         ::testing::ValuesIn({4, 8, 16, 20, 28, 32, 64, 84})));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     EmbeddingQuantizeSBFloatTest,
     ::testing::Combine(
@@ -604,7 +604,7 @@ class EmbeddingQuantizeFixedNumberTest : public testing::TestWithParam<int> {
   std::vector<uint8_t> expected_output_float;
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     EmbeddingQuantizeFixedNumberTest,
     ::testing::ValuesIn({2, 4, 8}));
diff --git a/test/RequantizeOnlyTest.cc b/test/RequantizeOnlyTest.cc
index 55fd31f98e..10fd8a11f0 100644
--- a/test/RequantizeOnlyTest.cc
+++ b/test/RequantizeOnlyTest.cc
@@ -35,7 +35,7 @@ class FloatRequantizeTest
 
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     FloatRequantizeTest,
     ::testing::Combine(
diff --git a/test/RowWiseSparseAdagradFusedTest.cc b/test/RowWiseSparseAdagradFusedTest.cc
index c59ddc6820..72925de5de 100644
--- a/test/RowWiseSparseAdagradFusedTest.cc
+++ b/test/RowWiseSparseAdagradFusedTest.cc
@@ -68,7 +68,7 @@ class RowWiseSparseAdagradFusedTest : public testing::TestWithParam<tuple<
 
 constexpr float DEFAULT_TOL = 1.0e-6;
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     RowWiseSparseAdagradFusedTest,
     ::testing::Combine(
diff --git a/test/SparseAdagradTest.cc b/test/SparseAdagradTest.cc
index a6f42970a3..cfe36938b2 100644
--- a/test/SparseAdagradTest.cc
+++ b/test/SparseAdagradTest.cc
@@ -52,7 +52,7 @@ class SparseAdagradTest
 constexpr float DEFAULT_TOL = 1.0e-6;
 
 // Test:
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     SparseAdagradTest,
     ::testing::Combine(
diff --git a/test/SparseDenseMMInt8Test.cc b/test/SparseDenseMMInt8Test.cc
index fd61384738..98e18bd29a 100644
--- a/test/SparseDenseMMInt8Test.cc
+++ b/test/SparseDenseMMInt8Test.cc
@@ -28,7 +28,7 @@ class SPMMInt8Test
     : public testing::TestWithParam<
           tuple<int, int, int, float, bool, QuantizationGranularity>> {};
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     SPMMInt8Test,
     ::testing::Combine(
diff --git a/test/SparsePackUnpackTest.cc b/test/SparsePackUnpackTest.cc
index cb34cfb8aa..012302b6bd 100644
--- a/test/SparsePackUnpackTest.cc
+++ b/test/SparsePackUnpackTest.cc
@@ -20,7 +20,7 @@ using namespace fbgemm;
 // tuple represents N and K
 class packUnpackTest : public testing::TestWithParam<tuple<int, int, float>> {};
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     packUnpackTest,
     ::testing::Combine(
diff --git a/test/TransposedRequantizeTest.cc b/test/TransposedRequantizeTest.cc
index e0e10ddbb7..fde9dd810e 100644
--- a/test/TransposedRequantizeTest.cc
+++ b/test/TransposedRequantizeTest.cc
@@ -35,7 +35,7 @@ class RequantizeTest
 
 }; // namespace
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     RequantizeTest,
     ::testing::Combine(
diff --git a/test/UniConvTest.cc b/test/UniConvTest.cc
index 7c3f01df90..f75f057862 100644
--- a/test/UniConvTest.cc
+++ b/test/UniConvTest.cc
@@ -165,7 +165,7 @@ class UniConvQGranTest
 }; // namespace
 
 // Combine only allows at most 10 generators.
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     uniConvTest,
     ::testing::Combine(
@@ -180,7 +180,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::ValuesIn({1, 2}), // stride
         ::testing::ValuesIn({0, 1, 2}))); // pad
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     InstantiationName,
     UniConvQGranTest,
     ::testing::Combine(