diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index 157b0c8f61e..e0a70ac7cd4 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -9,20 +9,30 @@ cc_test(
     name = "flatbuffers_test",
     testonly = 1,
     srcs = [
+        "evolution_test.cpp",
         "evolution_test/evolution_v1_generated.h",
         "evolution_test/evolution_v2_generated.h",
+        "flexbuffers_test.cpp",
+        "fuzz_test.cpp",
+        "json_test.cpp",
+        "monster_test.cpp",
         "monster_test_bfbs_generated.h",
         "namespace_test/namespace_test1_generated.h",
         "namespace_test/namespace_test2_generated.h",
         "native_type_test_impl.cpp",
         "native_type_test_impl.h",
         "optional_scalars_generated.h",
+        "optional_scalars_test.cpp",
+        "parser_test.cpp",
+        "proto_test.cpp",
+        "reflection_test.cpp",
         "test.cpp",
         "test_assert.cpp",
         "test_assert.h",
         "test_builder.cpp",
         "test_builder.h",
         "union_vector/union_vector_generated.h",
+        "util_test.cpp",
     ],
     copts = [
         "-DFLATBUFFERS_TRACK_VERIFIER_BUFFER_SIZE",
diff --git a/tests/util_test.cpp b/tests/util_test.cpp
index 69f1b90a059..d6db91673d7 100644
--- a/tests/util_test.cpp
+++ b/tests/util_test.cpp
@@ -130,8 +130,7 @@ void UtilConvertCase() {
       std::string expected_output;
     };
 
-    std::vector<TestCase>
-        cases;
+    std::vector<TestCase> cases;
 
     cases.push_back({ flatbuffers::Case::kUpperCamel, "TheQuickBrownFox",
                       flatbuffers::Case::kSnake, "the_quick_brown_fox" });
@@ -158,8 +157,7 @@ void UtilConvertCase() {
 
     for (auto &test_case : cases) {
       TEST_EQ(test_case.expected_output,
-              flatbuffers::ConvertCase(test_case.input,
-                                       test_case.output_case,
+              flatbuffers::ConvertCase(test_case.input, test_case.output_case,
                                        test_case.input_case));
     }
   }