diff --git a/Firestore/Example/GoogleTest.podspec b/Firestore/Example/GoogleTest.podspec
index 6776c8342e..377bf972d9 100644
--- a/Firestore/Example/GoogleTest.podspec
+++ b/Firestore/Example/GoogleTest.podspec
@@ -17,7 +17,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'GoogleTest'
-  s.version          = '1.8.1'
+  s.version          = '1.10.0'
   s.summary          = 'Google Test'
 
   s.description      = <<-DESC
@@ -86,6 +86,8 @@ Google's C++ test framework.
       '"${PODS_ROOT}/GoogleTest/googletest"'
   }
 
+  s.compiler_flags = '$(inherited) -Wno-comma'
+
   s.prepare_command = <<-'CMD'
     # Remove includes of files in internal/custom
     sed -i.bak -e '/include.*internal\/custom/ d' \
diff --git a/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc b/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc
index 2c26c45b40..1ead22afee 100644
--- a/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc
+++ b/Firestore/core/test/firebase/firestore/immutable/sorted_map_test.cc
@@ -70,7 +70,7 @@ typedef ::testing::Types<SortedMap<int, int>,
                          impl::ArraySortedMap<int, int>,
                          impl::TreeSortedMap<int, int>>
     TestedTypes;
-TYPED_TEST_CASE(SortedMapTest, TestedTypes);
+TYPED_TEST_SUITE(SortedMapTest, TestedTypes);
 
 TYPED_TEST(SortedMapTest, EmptySize) {
   TypeParam map;
diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_index_manager_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_index_manager_test.cc
index 4ba0f337eb..02a71e273b 100644
--- a/Firestore/core/test/firebase/firestore/local/leveldb_index_manager_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/leveldb_index_manager_test.cc
@@ -34,9 +34,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(LevelDbIndexManagerTest,
-                        IndexManagerTest,
-                        ::testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(LevelDbIndexManagerTest,
+                         IndexManagerTest,
+                         ::testing::Values(PersistenceFactory));
 
 }  // namespace local
 }  // namespace firestore
diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_query_cache_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_query_cache_test.cc
index b1a713aadc..803fbfbf84 100644
--- a/Firestore/core/test/firebase/firestore/local/leveldb_query_cache_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/leveldb_query_cache_test.cc
@@ -44,9 +44,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(LevelDbQueryCacheTest,
-                        QueryCacheTest,
-                        testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(LevelDbQueryCacheTest,
+                         QueryCacheTest,
+                         testing::Values(PersistenceFactory));
 
 class LevelDbQueryCacheTest : public QueryCacheTestBase {
  public:
diff --git a/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc b/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc
index 7f2a71c6e0..f144bcc2ac 100644
--- a/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/leveldb_remote_document_cache_test.cc
@@ -81,9 +81,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(LevelDbRemoteDocumentCacheTest,
-                        RemoteDocumentCacheTest,
-                        testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(LevelDbRemoteDocumentCacheTest,
+                         RemoteDocumentCacheTest,
+                         testing::Values(PersistenceFactory));
 
 }  // namespace local
 }  // namespace firestore
diff --git a/Firestore/core/test/firebase/firestore/local/memory_index_manager_test.cc b/Firestore/core/test/firebase/firestore/local/memory_index_manager_test.cc
index a523331e3d..4213613f66 100644
--- a/Firestore/core/test/firebase/firestore/local/memory_index_manager_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/memory_index_manager_test.cc
@@ -35,9 +35,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(MemoryIndexManagerTest,
-                        IndexManagerTest,
-                        ::testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(MemoryIndexManagerTest,
+                         IndexManagerTest,
+                         ::testing::Values(PersistenceFactory));
 
 }  // namespace local
 }  // namespace firestore
diff --git a/Firestore/core/test/firebase/firestore/local/memory_query_cache_test.cc b/Firestore/core/test/firebase/firestore/local/memory_query_cache_test.cc
index 18619f813d..0c4214f891 100644
--- a/Firestore/core/test/firebase/firestore/local/memory_query_cache_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/memory_query_cache_test.cc
@@ -29,9 +29,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(MemoryQueryCacheTest,
-                        QueryCacheTest,
-                        testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(MemoryQueryCacheTest,
+                         QueryCacheTest,
+                         testing::Values(PersistenceFactory));
 
 }  // namespace local
 }  // namespace firestore
diff --git a/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc b/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc
index a10bc5998e..98601c078a 100644
--- a/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc
+++ b/Firestore/core/test/firebase/firestore/local/memory_remote_document_cache_test.cc
@@ -36,9 +36,9 @@ std::unique_ptr<Persistence> PersistenceFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(MemoryRemoteDocumentCacheTest,
-                        RemoteDocumentCacheTest,
-                        testing::Values(PersistenceFactory));
+INSTANTIATE_TEST_SUITE_P(MemoryRemoteDocumentCacheTest,
+                         RemoteDocumentCacheTest,
+                         testing::Values(PersistenceFactory));
 
 }  // namespace local
 }  // namespace firestore
diff --git a/Firestore/core/test/firebase/firestore/local/query_cache_test.h b/Firestore/core/test/firebase/firestore/local/query_cache_test.h
index 2b9b3adf43..dfa73067c0 100644
--- a/Firestore/core/test/firebase/firestore/local/query_cache_test.h
+++ b/Firestore/core/test/firebase/firestore/local/query_cache_test.h
@@ -84,9 +84,9 @@ class QueryCacheTestBase : public testing::Test {
  * To test a specific implementation of QueryCache:
  *
  * + Write a persistence factory function
- * + Call INSTANTIATE_TEST_CASE_P(MyNewQueryCacheTest,
- *                                QueryCacheTest,
- *                                testing::Values(PersistenceFactory));
+ * + Call INSTANTIATE_TEST_SUITE_P(MyNewQueryCacheTest,
+ *                                 QueryCacheTest,
+ *                                 testing::Values(PersistenceFactory));
  */
 class QueryCacheTest : public QueryCacheTestBase,
                        public testing::WithParamInterface<FactoryFunc> {
diff --git a/Firestore/core/test/firebase/firestore/local/remote_document_cache_test.h b/Firestore/core/test/firebase/firestore/local/remote_document_cache_test.h
index 4d8f56199f..f358d08887 100644
--- a/Firestore/core/test/firebase/firestore/local/remote_document_cache_test.h
+++ b/Firestore/core/test/firebase/firestore/local/remote_document_cache_test.h
@@ -43,9 +43,9 @@ using FactoryFunc = std::unique_ptr<Persistence> (*)();
  * To test a specific implementation of RemoteDocumentCache:
  *
  * + Write a persistence factory function
- * + Call INSTANTIATE_TEST_CASE_P(MyNewRemoteDocumentCacheTest,
- *                                RemoteDocumentCacheTest,
- *                                testing::Values(PersistenceFactory));
+ * + Call INSTANTIATE_TEST_SUITE_P(MyNewRemoteDocumentCacheTest,
+ *                                 RemoteDocumentCacheTest,
+ *                                 testing::Values(PersistenceFactory));
  */
 class RemoteDocumentCacheTest : public ::testing::TestWithParam<FactoryFunc> {
  public:
diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm
index 105e7bfa1f..be0f200491 100644
--- a/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm
+++ b/Firestore/core/test/firebase/firestore/util/async_queue_libdispatch_test.mm
@@ -44,9 +44,9 @@ std::unique_ptr<Executor> CreateExecutorLibdispatch() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(AsyncQueueLibdispatch,
-                        AsyncQueueTest,
-                        ::testing::Values(CreateExecutorLibdispatch));
+INSTANTIATE_TEST_SUITE_P(AsyncQueueLibdispatch,
+                         AsyncQueueTest,
+                         ::testing::Values(CreateExecutorLibdispatch));
 
 class AsyncQueueTestLibdispatchOnly : public ::testing::Test,
                                       public testutil::AsyncTest {
diff --git a/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc
index 24f43e8c41..a46d500a95 100644
--- a/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/async_queue_std_test.cc
@@ -33,9 +33,9 @@ std::unique_ptr<Executor> ExecutorFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(AsyncQueueStd,
-                        AsyncQueueTest,
-                        ::testing::Values(ExecutorFactory));
+INSTANTIATE_TEST_SUITE_P(AsyncQueueStd,
+                         AsyncQueueTest,
+                         ::testing::Values(ExecutorFactory));
 }  // namespace util
 }  // namespace firestore
 }  // namespace firebase
diff --git a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm
index ffbd37a40c..b3f348c953 100644
--- a/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm
+++ b/Firestore/core/test/firebase/firestore/util/executor_libdispatch_test.mm
@@ -39,9 +39,9 @@ namespace chr = std::chrono;
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(ExecutorTestLibdispatch,
-                        ExecutorTest,
-                        ::testing::Values(ExecutorFactory));
+INSTANTIATE_TEST_SUITE_P(ExecutorTestLibdispatch,
+                         ExecutorTest,
+                         ::testing::Values(ExecutorFactory));
 
 namespace internal {
 class ExecutorLibdispatchOnlyTests : public ::testing::Test,
diff --git a/Firestore/core/test/firebase/firestore/util/executor_std_test.cc b/Firestore/core/test/firebase/firestore/util/executor_std_test.cc
index abbeff00fb..19540fcdaf 100644
--- a/Firestore/core/test/firebase/firestore/util/executor_std_test.cc
+++ b/Firestore/core/test/firebase/firestore/util/executor_std_test.cc
@@ -239,9 +239,9 @@ inline std::unique_ptr<Executor> ExecutorFactory() {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(ExecutorTestStd,
-                        ExecutorTest,
-                        ::testing::Values(ExecutorFactory));
+INSTANTIATE_TEST_SUITE_P(ExecutorTestStd,
+                         ExecutorTest,
+                         ::testing::Values(ExecutorFactory));
 
 }  // namespace util
 }  // namespace firestore
diff --git a/cmake/external/googletest.cmake b/cmake/external/googletest.cmake
index 691e301019..ac006b1381 100644
--- a/cmake/external/googletest.cmake
+++ b/cmake/external/googletest.cmake
@@ -14,7 +14,7 @@
 
 include(ExternalProject)
 
-set(version 1.8.1)
+set(version 1.10.0)
 
 ExternalProject_Add(
   googletest
@@ -22,7 +22,7 @@ ExternalProject_Add(
   DOWNLOAD_DIR ${FIREBASE_DOWNLOAD_DIR}
   DOWNLOAD_NAME googletest-${version}.tar.gz
   URL https://github.com/google/googletest/archive/release-${version}.tar.gz
-  URL_HASH SHA256=9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c
+  URL_HASH SHA256=9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb
 
   PREFIX ${PROJECT_BINARY_DIR}