diff --git a/tests/sys/fs/fusefs/bmap.cc b/tests/sys/fs/fusefs/bmap.cc
--- a/tests/sys/fs/fusefs/bmap.cc
+++ b/tests/sys/fs/fusefs/bmap.cc
@@ -253,6 +253,6 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(BE, BmapEof,
+INSTANTIATE_TEST_SUITE_P(BE, BmapEof,
 	Values(1, 2, 3)
 );
diff --git a/tests/sys/fs/fusefs/cache.cc b/tests/sys/fs/fusefs/cache.cc
--- a/tests/sys/fs/fusefs/cache.cc
+++ b/tests/sys/fs/fusefs/cache.cc
@@ -197,7 +197,7 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(Cache, Cache,
+INSTANTIATE_TEST_SUITE_P(Cache, Cache,
 	Combine(
 		/* Test every combination that:
 		 * - does not cache at least one of entries and attrs
diff --git a/tests/sys/fs/fusefs/dev_fuse_poll.cc b/tests/sys/fs/fusefs/dev_fuse_poll.cc
--- a/tests/sys/fs/fusefs/dev_fuse_poll.cc
+++ b/tests/sys/fs/fusefs/dev_fuse_poll.cc
@@ -98,7 +98,7 @@
 	m_mock->unmount();
 }
 
-INSTANTIATE_TEST_CASE_P(PM, DevFusePoll,
+INSTANTIATE_TEST_SUITE_P(PM, DevFusePoll,
 		::testing::Values("BLOCKING", "KQ", "POLL", "SELECT"));
 
 static void* statter(void* arg) {
diff --git a/tests/sys/fs/fusefs/fallocate.cc b/tests/sys/fs/fusefs/fallocate.cc
--- a/tests/sys/fs/fusefs/fallocate.cc
+++ b/tests/sys/fs/fusefs/fallocate.cc
@@ -493,8 +493,8 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(FspacectlCache, FspacectlCache,
-	Values(Uncached, Writethrough, Writeback),
+INSTANTIATE_TEST_SUITE_P(FspacectlCache, FspacectlCache,
+	Values(Uncached, Writethrough, Writeback)
 );
 
 /*
diff --git a/tests/sys/fs/fusefs/io.cc b/tests/sys/fs/fusefs/io.cc
--- a/tests/sys/fs/fusefs/io.cc
+++ b/tests/sys/fs/fusefs/io.cc
@@ -509,14 +509,14 @@
 	close(m_test_fd);
 }
 
-INSTANTIATE_TEST_CASE_P(Io, Io,
+INSTANTIATE_TEST_SUITE_P(Io, Io,
 	Combine(Bool(),					/* async read */
 		Values(0x1000, 0x10000, 0x20000),	/* m_maxwrite */
 		Values(Uncached, Writethrough, Writeback, WritebackAsync)
 	)
 );
 
-INSTANTIATE_TEST_CASE_P(Io, IoCacheable,
+INSTANTIATE_TEST_SUITE_P(Io, IoCacheable,
 	Combine(Bool(),					/* async read */
 		Values(0x1000, 0x10000, 0x20000),	/* m_maxwrite */
 		Values(Writethrough, Writeback, WritebackAsync)
diff --git a/tests/sys/fs/fusefs/last_local_modify.cc b/tests/sys/fs/fusefs/last_local_modify.cc
--- a/tests/sys/fs/fusefs/last_local_modify.cc
+++ b/tests/sys/fs/fusefs/last_local_modify.cc
@@ -506,7 +506,7 @@
 }
 
 
-INSTANTIATE_TEST_CASE_P(LLM, LastLocalModify,
+INSTANTIATE_TEST_SUITE_P(LLM, LastLocalModify,
 	Values(
 		"VOP_ALLOCATE",
 		"VOP_COPY_FILE_RANGE",
diff --git a/tests/sys/fs/fusefs/mount.cc b/tests/sys/fs/fusefs/mount.cc
--- a/tests/sys/fs/fusefs/mount.cc
+++ b/tests/sys/fs/fusefs/mount.cc
@@ -192,11 +192,11 @@
 	EXPECT_TRUE((newflags ^ statbuf.f_flags) & flag);
 }
 
-INSTANTIATE_TEST_CASE_P(Mount, UpdateOk,
+INSTANTIATE_TEST_SUITE_P(Mount, UpdateOk,
 		::testing::Values("MNT_RDONLY", "MNT_NOEXEC", "MNT_NOSUID", "MNT_NOATIME",
 		"MNT_SUIDDIR")
 );
 
-INSTANTIATE_TEST_CASE_P(Mount, UpdateErr,
-		::testing::Values( "MNT_USER");
+INSTANTIATE_TEST_SUITE_P(Mount, UpdateErr,
+		::testing::Values( "MNT_USER")
 );
diff --git a/tests/sys/fs/fusefs/read.cc b/tests/sys/fs/fusefs/read.cc
--- a/tests/sys/fs/fusefs/read.cc
+++ b/tests/sys/fs/fusefs/read.cc
@@ -1314,7 +1314,7 @@
 	free(contents);
 }
 
-INSTANTIATE_TEST_CASE_P(RA, ReadAhead,
+INSTANTIATE_TEST_SUITE_P(RA, ReadAhead,
 	Values(tuple<bool, int>(false, 0),
 	       tuple<bool, int>(false, 1),
 	       tuple<bool, int>(false, 2),
@@ -1362,4 +1362,4 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(TG, TimeGran, Range(0u, 10u));
+INSTANTIATE_TEST_SUITE_P(TG, TimeGran, Range(0u, 10u));
diff --git a/tests/sys/fs/fusefs/write.cc b/tests/sys/fs/fusefs/write.cc
--- a/tests/sys/fs/fusefs/write.cc
+++ b/tests/sys/fs/fusefs/write.cc
@@ -616,7 +616,7 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(W, WriteRlimitFsize,
+INSTANTIATE_TEST_SUITE_P(W, WriteRlimitFsize,
 	Values(0, O_DIRECT)
 );
 
@@ -724,7 +724,7 @@
 
 }
 
-INSTANTIATE_TEST_CASE_P(W, WriteEofDuringVnopStrategy,
+INSTANTIATE_TEST_SUITE_P(W, WriteEofDuringVnopStrategy,
 	Values(1, 2, 3)
 );
 
@@ -1546,7 +1546,7 @@
 	leak(fd);
 }
 
-INSTANTIATE_TEST_CASE_P(RA, TimeGran, Range(0u, 10u));
+INSTANTIATE_TEST_SUITE_P(RA, TimeGran, Range(0u, 10u));
 
 /*
  * Without direct_io, writes should be committed to cache