diff --git a/python/google/registry/reporting/icann_report_query_builder.py b/python/google/registry/reporting/icann_report_query_builder.py
index 359f4c461..d85d841ec 100644
--- a/python/google/registry/reporting/icann_report_query_builder.py
+++ b/python/google/registry/reporting/icann_report_query_builder.py
@@ -32,6 +32,7 @@ import datetime
 # exact format, so it must be kept in sync with the logging site.
 # TODO(b/20725722): make the log statement format more robust.
 FLOWRUNNER_LOG_SIGNATURE_PATTERN = '(?:{}): EPP Command'.format('|'.join([
+    'google.registry.flows.FlowRunner run',
     'com.google.domain.registry.flows.FlowRunner run',
     # TODO(b/29397966): figure out why this is FormattingLogger vs FlowRunner.
     'com.google.domain.registry.util.FormattingLogger log',
diff --git a/python/google/registry/reporting/testdata/golden_activity_query.sql b/python/google/registry/reporting/testdata/golden_activity_query.sql
index 95cf9fcbc..8a645e97c 100644
--- a/python/google/registry/reporting/testdata/golden_activity_query.sql
+++ b/python/google/registry/reporting/testdata/golden_activity_query.sql
@@ -241,8 +241,8 @@
 
       -- Query EPP request logs and extract the clientId and raw EPP XML.
       SELECT
-        REGEXP_EXTRACT(logMessage, r'^(?:com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command\n\t.+\n\t(.+)\n') AS clientId,
-        REGEXP_EXTRACT(logMessage, r'^(?:com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command\n\t.+\n\t.+\n\t.+\n\t((?s).+)$') AS xml,
+        REGEXP_EXTRACT(logMessage, r'^(?:google.registry.flows.FlowRunner run|com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command\n\t.+\n\t(.+)\n') AS clientId,
+        REGEXP_EXTRACT(logMessage, r'^(?:google.registry.flows.FlowRunner run|com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command\n\t.+\n\t.+\n\t.+\n\t((?s).+)$') AS xml,
       FROM (
         -- BEGIN LOGS QUERY --
 
@@ -263,7 +263,7 @@
       WHERE
         -- EPP endpoints from the proxy, regtool, and console respectively.
         requestPath IN ('/_dr/epp', '/_dr/epptool', '/registrar-xhr')
-        AND REGEXP_MATCH(logMessage, r'^(?:com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command')
+        AND REGEXP_MATCH(logMessage, r'^(?:google.registry.flows.FlowRunner run|com.google.domain.registry.flows.FlowRunner run|com.google.domain.registry.util.FormattingLogger log|google.registry.util.FormattingLogger log): EPP Command')
 
         -- END EPP XML LOGS QUERY --
        )