diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow.json
index df920af419af..39523ea7c0fb 100644
--- a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow.json
+++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow.json
@@ -1,4 +1,4 @@
 {
-  "comment": "Modify this file in a trivial way to cause this test suite to run",
+  "comment": "Modify this file in a trivial way to cause this test suite to run!",
   "modification": 3,
 }
diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming.json
index f7c66d31909d..e623d3373a93 100644
--- a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming.json
+++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_Streaming.json
@@ -1,4 +1,4 @@
 {
-  "comment": "Modify this file in a trivial way to cause this test suite to run",
+  "comment": "Modify this file in a trivial way to cause this test suite to run!",
   "modification":  1,
 }
diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2.json
index b26833333238..794c7aabad6b 100644
--- a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2.json
+++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2.json
@@ -1,4 +1,4 @@
 {
-  "comment": "Modify this file in a trivial way to cause this test suite to run",
+  "comment": "Modify this file in a trivial way to cause this test suite to run!",
   "modification": 2
 }
diff --git a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2_Streaming.json b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2_Streaming.json
index 6299c7b12438..ca6b5440de4f 100644
--- a/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2_Streaming.json
+++ b/.github/trigger_files/beam_PostCommit_Java_ValidatesRunner_Dataflow_V2_Streaming.json
@@ -1,4 +1,4 @@
 {
-  "comment": "Modify this file in a trivial way to cause this test suite to run",
+  "comment": "Modify this file in a trivial way to cause this test suite to run!",
   "modification": 1,
 }
diff --git a/runners/google-cloud-dataflow-java/build.gradle b/runners/google-cloud-dataflow-java/build.gradle
index 3e5ff2637650..c2720fe5ac77 100644
--- a/runners/google-cloud-dataflow-java/build.gradle
+++ b/runners/google-cloud-dataflow-java/build.gradle
@@ -214,9 +214,6 @@ def commonLegacyExcludeCategories = [
 def commonRunnerV2ExcludeCategories = [
   'org.apache.beam.sdk.testing.UsesExternalService',
   'org.apache.beam.sdk.testing.UsesGaugeMetrics',
-  'org.apache.beam.sdk.testing.UsesSetState',
-  'org.apache.beam.sdk.testing.UsesMapState',
-  'org.apache.beam.sdk.testing.UsesMultimapState',
   'org.apache.beam.sdk.testing.UsesMetricsPusher',
   'org.apache.beam.sdk.testing.UsesTestStream',
   'org.apache.beam.sdk.testing.UsesTestStreamWithProcessingTime',
@@ -448,9 +445,6 @@ task validatesRunner {
   description "Validates Dataflow runner"
   dependsOn(createLegacyWorkerValidatesRunnerTest(
     name: 'validatesRunnerLegacyWorkerTest',
-    excludedCategories: [
-      'org.apache.beam.sdk.testing.UsesMultimapState',
-    ],
     excludedTests: [
       // TODO(https://github.com/apache/beam/issues/21472)
       'org.apache.beam.sdk.transforms.GroupByKeyTest$BasicTests.testAfterProcessingTimeContinuationTriggerUsingState',