diff --git a/starboard/nplb/string_compare_no_case_n_test.cc b/starboard/nplb/string_compare_no_case_n_test.cc
index 761693faebe0..5cd234978c80 100644
--- a/starboard/nplb/string_compare_no_case_n_test.cc
+++ b/starboard/nplb/string_compare_no_case_n_test.cc
@@ -56,7 +56,7 @@ TEST(SbStringCompareNoCaseNTest, SunnyDayCase) {
   EXPECT_EQ(0,
             SbStringCompareNoCaseN(kString4, kString3, strlen(kString4) / 2));
 }
-#endif // SB_API_VERSION < 16
+#endif  // SB_API_VERSION < 16
 
 }  // namespace
 }  // namespace nplb
diff --git a/starboard/nplb/string_compare_no_case_test.cc b/starboard/nplb/string_compare_no_case_test.cc
index f173db3e7e10..73544d0295ca 100644
--- a/starboard/nplb/string_compare_no_case_test.cc
+++ b/starboard/nplb/string_compare_no_case_test.cc
@@ -37,7 +37,7 @@ TEST(SbStringCompareNoCaseTest, SunnyDayCase) {
   EXPECT_EQ(0, SbStringCompareNoCase(kString1, kString2));
   EXPECT_EQ(0, SbStringCompareNoCase(kString2, kString1));
 }
-#endif // SB_API_VERSION < 16
+#endif  // SB_API_VERSION < 16
 }  // namespace
 }  // namespace nplb
 }  // namespace starboard
diff --git a/starboard/nplb/string_duplicate_test.cc b/starboard/nplb/string_duplicate_test.cc
index ddf5f19c5ad9..a0afb7b04ad3 100644
--- a/starboard/nplb/string_duplicate_test.cc
+++ b/starboard/nplb/string_duplicate_test.cc
@@ -25,9 +25,9 @@ void RunTest(const char* input) {
   char* dupe = SbStringDuplicate(input);
   const char* kNull = NULL;
   EXPECT_NE(kNull, dupe);
-  #if SB_API_VERSION < 16
+#if SB_API_VERSION < 16
   EXPECT_EQ(0, SbStringCompareNoCase(input, dupe));
-  #endif //SB_API_VERSION < 16
+#endif  // SB_API_VERSION < 16
   EXPECT_EQ(strlen(input), strlen(dupe));
   SbMemoryDeallocate(dupe);
 }