diff --git a/build_defs.bzl b/build_defs.bzl
index 717a0e78b9..da21e8642e 100644
--- a/build_defs.bzl
+++ b/build_defs.bzl
@@ -182,13 +182,14 @@ _file_list_aspect = aspect(
 )
 
 def _upb_amalgamation(ctx):
+    inputs = []
     srcs = []
-    hdrs = []
     for lib in ctx.attr.libs:
-        srcs += lib[SrcList].srcs
-        hdrs += lib[SrcList].hdrs
+        inputs += lib[SrcList].srcs
+        inputs += lib[SrcList].hdrs
+        srcs += [src for src in lib[SrcList].srcs if src.path.endswith("c")]
     ctx.actions.run(
-        inputs = srcs + hdrs,
+        inputs = inputs,
         outputs = ctx.outputs.outs,
         arguments = ["", ctx.bin_dir.path + "/"] + [f.path for f in srcs],
         progress_message = "Making amalgamation",
diff --git a/kokoro/ubuntu/build.sh b/kokoro/ubuntu/build.sh
index 70a81592a5..3550a34ed4 100644
--- a/kokoro/ubuntu/build.sh
+++ b/kokoro/ubuntu/build.sh
@@ -8,4 +8,4 @@ which bazel
 bazel version
 
 cd $(dirname $0)/../..
-bazel test :all
+bazel test --test_output=errors :all