diff --git a/googletest/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
index f84def90..78f3ee2b 100644
--- a/googletest/test/gtest_unittest.cc
+++ b/googletest/test/gtest_unittest.cc
@@ -2096,7 +2096,7 @@ class UnitTestRecordPropertyTestEnvironment : public Environment {
 };
 
 // This will test property recording outside of any test or test case.
-static Environment* record_property_env =
+Environment* record_property_env =
     AddGlobalTestEnvironment(new UnitTestRecordPropertyTestEnvironment);
 
 // This group of tests is for predicate assertions (ASSERT_PRED*, etc)
@@ -4188,6 +4188,12 @@ TEST(AssertionSyntaxTest, WorksWithConst) {
 
 }  // namespace
 
+// we don't use the variable further, just avoid compiler warning
+// by defining a function which uses it
+void dummy_use_of_record_property_env() {
+	(void) record_property_env;
+}
+
 namespace testing {
 
 // Tests that Google Test tracks SUCCEED*.