diff --git a/cpp/src/phonenumbers/stringutil.cc b/cpp/src/phonenumbers/stringutil.cc
index 999b334de..fef4b59f0 100644
--- a/cpp/src/phonenumbers/stringutil.cc
+++ b/cpp/src/phonenumbers/stringutil.cc
@@ -293,4 +293,4 @@ void StrAppend(string* dest, const StringHolder& s1, const StringHolder& s2,
 }
 
 }  // namespace phonenumbers
-}  // namespace i18n
\ No newline at end of file
+}  // namespace i18n
diff --git a/cpp/test/phonenumbers/stringutil_test.cc b/cpp/test/phonenumbers/stringutil_test.cc
index 32747085c..f49d65182 100644
--- a/cpp/test/phonenumbers/stringutil_test.cc
+++ b/cpp/test/phonenumbers/stringutil_test.cc
@@ -135,7 +135,7 @@ TEST(StringUtilTest, safe_strtou64) {
   safe_strtou64("16", &n);
   EXPECT_EQ(16U, n);
 
-  safe_strtou64("18446744073709551615UL", &n);
+  safe_strtou64("18446744073709551615", &n);
   EXPECT_EQ(18446744073709551615ULL, n);
 }