diff --git a/googletest/test/googletest-output-test_.cc b/googletest/test/googletest-output-test_.cc
index e3560c018..e30b69bbe 100644
--- a/googletest/test/googletest-output-test_.cc
+++ b/googletest/test/googletest-output-test_.cc
@@ -720,6 +720,7 @@ class TypedTestNames {
       return std::string("char") + ::testing::PrintToString(i);
     if (std::is_same<T, int>::value)
       return std::string("int") + ::testing::PrintToString(i);
+    return std::string("unknown");
   }
 };
 
@@ -755,6 +756,7 @@ class TypedTestPNames {
     if (std::is_same<T, unsigned int>::value) {
       return std::string("unsignedInt") + ::testing::PrintToString(i);
     }
+    return std::string("unknown");
   }
 };
 
diff --git a/googletest/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc
index 0cc8b2114..6b90ee4a0 100644
--- a/googletest/test/gtest-typed-test_test.cc
+++ b/googletest/test/gtest-typed-test_test.cc
@@ -172,6 +172,7 @@ class TypedTestNames {
     if (std::is_same<T, int>::value) {
       return std::string("int") + ::testing::PrintToString(i);
     }
+    return std::string("unknown");
   }
 };
 
@@ -320,6 +321,7 @@ class TypeParametrizedTestNames {
     if (std::is_same<T, int>::value) {
       return std::string("parInt") + ::testing::PrintToString(i);
     }
+    return std::string("unknown");
   }
 };