diff --git a/googletest/include/gtest/gtest-spi.h b/googletest/include/gtest/gtest-spi.h
index c0613b695..638d2940c 100644
--- a/googletest/include/gtest/gtest-spi.h
+++ b/googletest/include/gtest/gtest-spi.h
@@ -153,10 +153,10 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
       static void Execute() { statement; }                                    \
     };                                                                        \
     ::testing::TestPartResultArray gtest_failures;                            \
-    ::testing::internal::SingleFailureChecker gtest_checker(                  \
+    const ::testing::internal::SingleFailureChecker gtest_checker(            \
         &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \
     {                                                                         \
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(             \
+      const ::testing::ScopedFakeTestPartResultReporter gtest_reporter(       \
           ::testing::ScopedFakeTestPartResultReporter::                       \
               INTERCEPT_ONLY_CURRENT_THREAD,                                  \
           &gtest_failures);                                                   \
@@ -171,10 +171,10 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
       static void Execute() { statement; }                                    \
     };                                                                        \
     ::testing::TestPartResultArray gtest_failures;                            \
-    ::testing::internal::SingleFailureChecker gtest_checker(                  \
+    const ::testing::internal::SingleFailureChecker gtest_checker(            \
         &gtest_failures, ::testing::TestPartResult::kFatalFailure, (substr)); \
     {                                                                         \
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(             \
+      const ::testing::ScopedFakeTestPartResultReporter gtest_reporter(       \
           ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
           &gtest_failures);                                                   \
       GTestExpectFatalFailureHelper::Execute();                               \
@@ -214,31 +214,31 @@ GTEST_DISABLE_MSC_WARNINGS_POP_()  //  4251
 // instead of
 //   GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement)
 // to avoid an MSVC warning on unreachable code.
-#define EXPECT_NONFATAL_FAILURE(statement, substr)                    \
-  do {                                                                \
-    ::testing::TestPartResultArray gtest_failures;                    \
-    ::testing::internal::SingleFailureChecker gtest_checker(          \
-        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure, \
-        (substr));                                                    \
-    {                                                                 \
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(     \
-          ::testing::ScopedFakeTestPartResultReporter::               \
-              INTERCEPT_ONLY_CURRENT_THREAD,                          \
-          &gtest_failures);                                           \
-      if (::testing::internal::AlwaysTrue()) {                        \
-        statement;                                                    \
-      }                                                               \
-    }                                                                 \
+#define EXPECT_NONFATAL_FAILURE(statement, substr)                      \
+  do {                                                                  \
+    ::testing::TestPartResultArray gtest_failures;                      \
+    const ::testing::internal::SingleFailureChecker gtest_checker(      \
+        &gtest_failures, ::testing::TestPartResult::kNonFatalFailure,   \
+        (substr));                                                      \
+    {                                                                   \
+      const ::testing::ScopedFakeTestPartResultReporter gtest_reporter( \
+          ::testing::ScopedFakeTestPartResultReporter::                 \
+              INTERCEPT_ONLY_CURRENT_THREAD,                            \
+          &gtest_failures);                                             \
+      if (::testing::internal::AlwaysTrue()) {                          \
+        statement;                                                      \
+      }                                                                 \
+    }                                                                   \
   } while (::testing::internal::AlwaysFalse())
 
 #define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr)             \
   do {                                                                        \
     ::testing::TestPartResultArray gtest_failures;                            \
-    ::testing::internal::SingleFailureChecker gtest_checker(                  \
+    const ::testing::internal::SingleFailureChecker gtest_checker(            \
         &gtest_failures, ::testing::TestPartResult::kNonFatalFailure,         \
         (substr));                                                            \
     {                                                                         \
-      ::testing::ScopedFakeTestPartResultReporter gtest_reporter(             \
+      const ::testing::ScopedFakeTestPartResultReporter gtest_reporter(       \
           ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \
           &gtest_failures);                                                   \
       if (::testing::internal::AlwaysTrue()) {                                \
diff --git a/googletest/include/gtest/internal/gtest-death-test-internal.h b/googletest/include/gtest/internal/gtest-death-test-internal.h
index b363259ec..99dae15f1 100644
--- a/googletest/include/gtest/internal/gtest-death-test-internal.h
+++ b/googletest/include/gtest/internal/gtest-death-test-internal.h
@@ -218,35 +218,35 @@ GTEST_API_ bool ExitedUnsuccessfully(int exit_status);
 
 // This macro is for implementing ASSERT_DEATH*, EXPECT_DEATH*,
 // ASSERT_EXIT*, and EXPECT_EXIT*.
-#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)        \
-  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                \
-  if (::testing::internal::AlwaysTrue()) {                                     \
-    ::testing::internal::DeathTest* gtest_dt;                                  \
-    if (!::testing::internal::DeathTest::Create(                               \
-            #statement,                                                        \
-            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),       \
-            __FILE__, __LINE__, &gtest_dt)) {                                  \
-      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
-    }                                                                          \
-    if (gtest_dt != nullptr) {                                                 \
-      std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
-      switch (gtest_dt->AssumeRole()) {                                        \
-        case ::testing::internal::DeathTest::OVERSEE_TEST:                     \
-          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                \
-            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                  \
-          }                                                                    \
-          break;                                                               \
-        case ::testing::internal::DeathTest::EXECUTE_TEST: {                   \
-          const ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel( \
-              gtest_dt);                                                       \
-          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);            \
-          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);   \
-          break;                                                               \
-        }                                                                      \
-      }                                                                        \
-    }                                                                          \
-  } else                                                                       \
-    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                \
+#define GTEST_DEATH_TEST_(statement, predicate, regex_or_matcher, fail)              \
+  GTEST_AMBIGUOUS_ELSE_BLOCKER_                                                      \
+  if (::testing::internal::AlwaysTrue()) {                                           \
+    ::testing::internal::DeathTest* gtest_dt;                                        \
+    if (!::testing::internal::DeathTest::Create(                                     \
+            #statement,                                                              \
+            ::testing::internal::MakeDeathTestMatcher(regex_or_matcher),             \
+            __FILE__, __LINE__, &gtest_dt)) {                                        \
+      goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                              \
+    }                                                                                \
+    if (gtest_dt != nullptr) {                                                       \
+      const std::unique_ptr< ::testing::internal::DeathTest> gtest_dt_ptr(gtest_dt); \
+      switch (gtest_dt->AssumeRole()) {                                              \
+        case ::testing::internal::DeathTest::OVERSEE_TEST:                           \
+          if (!gtest_dt->Passed(predicate(gtest_dt->Wait()))) {                      \
+            goto GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__);                        \
+          }                                                                          \
+          break;                                                                     \
+        case ::testing::internal::DeathTest::EXECUTE_TEST: {                         \
+          const ::testing::internal::DeathTest::ReturnSentinel gtest_sentinel(       \
+              gtest_dt);                                                             \
+          GTEST_EXECUTE_DEATH_TEST_STATEMENT_(statement, gtest_dt);                  \
+          gtest_dt->Abort(::testing::internal::DeathTest::TEST_DID_NOT_DIE);         \
+          break;                                                                     \
+        }                                                                            \
+      }                                                                              \
+    }                                                                                \
+  } else                                                                             \
+    GTEST_CONCAT_TOKEN_(gtest_label_, __LINE__)                                      \
         : fail(::testing::internal::DeathTest::LastMessage())
 // The symbol "fail" here expands to something into which a message
 // can be streamed.