diff --git a/BUILD.bazel b/BUILD.bazel
index 51a70578..3842ba42 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -1090,7 +1090,7 @@ cc_test(
         ":benchmark_helper",
         ":gemma_lib",
         ":test_util",
-        "@googletest//:gtest_main",  # buildcleaner: keep
+        "//testing/base/public:gunit",  # Defines its own main.
         "@highway//:hwy",
         "@highway//:hwy_test_util",
         "@highway//:nanobenchmark",
diff --git a/evals/gemma_batch_bench.cc b/evals/gemma_batch_bench.cc
index 5d6a57e7..053119e3 100644
--- a/evals/gemma_batch_bench.cc
+++ b/evals/gemma_batch_bench.cc
@@ -16,6 +16,8 @@
 #include <stdio.h>
 
 #include <algorithm>
+#include <cmath>
+#include <random>
 #include <string>
 #include <vector>
 
@@ -25,6 +27,7 @@
 #include "hwy/base.h"
 #include "hwy/nanobenchmark.h"
 #include "hwy/profiler.h"
+#include "hwy/timer.h"
 
 namespace gcpp {
 namespace {
@@ -122,6 +125,9 @@ std::vector<std::string> GenerateInputs() {
 }
 
 TEST_F(GemmaBatchBench, RandomQuestionsBatched) {
+  if (s_env->GetGemma()->Config().IsEmbedding()) {
+    GTEST_SKIP() << "Embedding models do not generate";
+  }
   s_env->SetMaxGeneratedTokens(12);
   const std::vector<std::string> inputs = GenerateInputs();
   constexpr size_t kNumReps = 7;