diff --git a/starboard/nplb/player_create_test.cc b/starboard/nplb/player_create_test.cc
index 1ea5ea27243..5dd8c2567f7 100644
--- a/starboard/nplb/player_create_test.cc
+++ b/starboard/nplb/player_create_test.cc
@@ -322,16 +322,23 @@ TEST_F(SbPlayerTest, MultiPlayer) {
   constexpr SbPlayerOutputMode kOutputModes[] = {
       kSbPlayerOutputModeDecodeToTexture, kSbPlayerOutputModePunchOut};
 
+  // clang-format off
   constexpr SbMediaAudioCodec kAudioCodecs[] = {
       kSbMediaAudioCodecNone,
 
-      kSbMediaAudioCodecAac,  kSbMediaAudioCodecAc3,    kSbMediaAudioCodecEac3,
-      kSbMediaAudioCodecOpus, kSbMediaAudioCodecVorbis, kSbMediaAudioCodecMp3,
-      kSbMediaAudioCodecFlac, kSbMediaAudioCodecPcm,
+      kSbMediaAudioCodecAac,
+      kSbMediaAudioCodecAc3,
+      kSbMediaAudioCodecEac3,
+      kSbMediaAudioCodecOpus,
+      kSbMediaAudioCodecVorbis,
+      kSbMediaAudioCodecMp3,
+      kSbMediaAudioCodecFlac,
+      kSbMediaAudioCodecPcm,
 #if SB_API_VERSION >= 15
       kSbMediaAudioCodecIamf,
 #endif  // SB_API_VERSION >= 15
   };
+  // clang-format on
 
   // TODO: turn this into a macro.
   // Perform a check to determine if new audio codecs have been added to the
@@ -354,13 +361,20 @@ TEST_F(SbPlayerTest, MultiPlayer) {
       break;
   }
 
+  // clang-format off
   constexpr SbMediaVideoCodec kVideoCodecs[] = {
       kSbMediaVideoCodecNone,
 
-      kSbMediaVideoCodecH264,   kSbMediaVideoCodecH265, kSbMediaVideoCodecMpeg2,
-      kSbMediaVideoCodecTheora, kSbMediaVideoCodecVc1,  kSbMediaVideoCodecAv1,
-      kSbMediaVideoCodecVp8,    kSbMediaVideoCodecVp9,
+      kSbMediaVideoCodecH264,
+      kSbMediaVideoCodecH265,
+      kSbMediaVideoCodecMpeg2,
+      kSbMediaVideoCodecTheora,
+      kSbMediaVideoCodecVc1,
+      kSbMediaVideoCodecAv1,
+      kSbMediaVideoCodecVp8,
+      kSbMediaVideoCodecVp9,
   };
+  // clang-format on
 
   // TODO: turn this into a macro.
   // Perform a check to determine if new video codecs have been added to the
diff --git a/starboard/nplb/player_get_preferred_output_mode_test.cc b/starboard/nplb/player_get_preferred_output_mode_test.cc
index 4e9113e9d7a..69e5be37b51 100644
--- a/starboard/nplb/player_get_preferred_output_mode_test.cc
+++ b/starboard/nplb/player_get_preferred_output_mode_test.cc
@@ -44,24 +44,39 @@ TEST(SbPlayerGetPreferredOutputModeTest, SunnyDay) {
 }
 
 TEST(SbPlayerGetPreferredOutputModeTest, AllCodecs) {
+  // clang-format off
   const SbMediaAudioCodec kAudioCodecs[] = {
-      kSbMediaAudioCodecNone, kSbMediaAudioCodecAac,  kSbMediaAudioCodecAc3,
-      kSbMediaAudioCodecEac3, kSbMediaAudioCodecOpus, kSbMediaAudioCodecVorbis,
-      kSbMediaAudioCodecMp3,  kSbMediaAudioCodecFlac, kSbMediaAudioCodecPcm,
+      kSbMediaAudioCodecNone,
+
+      kSbMediaAudioCodecAac,
+      kSbMediaAudioCodecAc3,
+      kSbMediaAudioCodecEac3,
+      kSbMediaAudioCodecOpus,
+      kSbMediaAudioCodecVorbis,
+      kSbMediaAudioCodecMp3,
+      kSbMediaAudioCodecFlac,
+      kSbMediaAudioCodecPcm,
 #if SB_API_VERSION >= 15
       kSbMediaAudioCodecIamf,
 #endif  // SB_API_VERSION >= 15
   };
   const SbMediaVideoCodec kVideoCodecs[] = {
-      kSbMediaVideoCodecNone,  kSbMediaVideoCodecH264,   kSbMediaVideoCodecH265,
-      kSbMediaVideoCodecMpeg2, kSbMediaVideoCodecTheora, kSbMediaVideoCodecVc1,
-      kSbMediaVideoCodecAv1,   kSbMediaVideoCodecVp8,    kSbMediaVideoCodecVp9,
+      kSbMediaVideoCodecNone,
+      kSbMediaVideoCodecH264,
+      kSbMediaVideoCodecH265,
+      kSbMediaVideoCodecMpeg2,
+      kSbMediaVideoCodecTheora,
+      kSbMediaVideoCodecVc1,
+      kSbMediaVideoCodecAv1,
+      kSbMediaVideoCodecVp8,
+      kSbMediaVideoCodecVp9,
   };
   const SbPlayerOutputMode kOutputModes[] = {
       kSbPlayerOutputModeDecodeToTexture,
       kSbPlayerOutputModePunchOut,
       kSbPlayerOutputModeInvalid,
   };
+  // clang-format on
 
   for (SbMediaAudioCodec audio_codec : kAudioCodecs) {
     for (SbMediaVideoCodec video_codec : kVideoCodecs) {