diff --git a/javatests/google/registry/batch/BUILD b/javatests/google/registry/batch/BUILD
index c32557d35..721bbc87b 100644
--- a/javatests/google/registry/batch/BUILD
+++ b/javatests/google/registry/batch/BUILD
@@ -39,7 +39,7 @@ java_library(
 
 GenTestRules(
     name = "GeneratedTestRules",
-    default_test_size = "large",
+    default_test_size = "medium",
     shard_count = 4,
     test_files = glob(["*Test.java"]),
     deps = [":batch"],
diff --git a/javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java b/javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
index 755a067d7..ceb434c67 100644
--- a/javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
+++ b/javatests/google/registry/batch/ExpandRecurringBillingEventsActionTest.java
@@ -44,6 +44,7 @@ import google.registry.testing.ExceptionRule;
 import google.registry.testing.FakeClock;
 import google.registry.testing.FakeResponse;
 import google.registry.testing.mapreduce.MapreduceTestCase;
+import google.registry.util.FormattingLogger;
 import java.util.ArrayList;
 import java.util.List;
 import org.joda.money.Money;
@@ -51,11 +52,12 @@ import org.joda.time.DateTime;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TestName;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-
 /** Unit tests for {@link ExpandRecurringBillingEventsAction}. */
+// The logger in this class is temporary, necessary for diagnosing some odd test failure behavior.
 @RunWith(JUnit4.class)
 public class ExpandRecurringBillingEventsActionTest
     extends MapreduceTestCase<ExpandRecurringBillingEventsAction> {
@@ -63,6 +65,11 @@ public class ExpandRecurringBillingEventsActionTest
   @Rule
   public final ExceptionRule thrown = new ExceptionRule();
 
+  @Rule
+  public TestName testName = new TestName();
+
+  private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();
+
   final FakeClock clock = new FakeClock(DateTime.parse("2000-10-02T00:00:00Z"));
 
   DomainResource domain;
@@ -71,6 +78,7 @@ public class ExpandRecurringBillingEventsActionTest
 
   @Before
   public void init() {
+    logger.infofmt("Running test %s", testName.getMethodName());
     action = new ExpandRecurringBillingEventsAction();
     action.mrRunner = makeDefaultRunner();
     action.clock = clock;