diff --git a/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy b/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
index c1a44b8e9d43..779395bf7093 100644
--- a/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
+++ b/.test-infra/jenkins/job_PostCommit_Python_Examples_Flink.groovy
@@ -37,7 +37,6 @@ PostcommitJobBuilder.postCommitJob('beam_PostCommit_Python_Examples_Flink',
         gradle {
           rootBuildScriptDir(commonJobProperties.checkoutDir)
           tasks(":sdks:python:test-suites:portable:flinkExamplesPostCommit")
-          switches("-PflinkConfDir=$WORKSPACE/src/runners/flink/src/test/resources")
           commonJobProperties.setGradleSwitches(delegate)
         }
       }
diff --git a/sdks/go/test/integration/integration.go b/sdks/go/test/integration/integration.go
index 26acc5137e60..2253df597bb4 100644
--- a/sdks/go/test/integration/integration.go
+++ b/sdks/go/test/integration/integration.go
@@ -137,8 +137,6 @@ var portableFilters = []string{
 var flinkFilters = []string{
 	// TODO(https://github.com/apache/beam/issues/20723): Flink tests timing out on reads.
 	"TestXLang_Combine.*",
-	// TODO(https://github.com/apache/beam/issues/21094): Test fails on post commits: "Insufficient number of network buffers".
-	"TestXLang_Multi",
 	"TestDebeziumIO_BasicRead",
 	// TODO(BEAM-13215): GCP IOs currently do not work in non-Dataflow portable runners.
 	"TestBigQueryIO.*",
diff --git a/sdks/python/apache_beam/examples/complete/tfidf_it_test.py b/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
index fe1649bbfa35..3ecbd0c1ecae 100644
--- a/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
+++ b/sdks/python/apache_beam/examples/complete/tfidf_it_test.py
@@ -42,6 +42,7 @@
 
 class TfIdfIT(unittest.TestCase):
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_basics(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
index 1f58e82e47d9..bce8584db21c 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_it_test.py
@@ -45,6 +45,7 @@ def setUp(self):
 
   @pytest.mark.no_xdist
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_bigquery_side_input_it(self):
     state_verifier = PipelineStateMatcher(PipelineState.DONE)
     NUM_GROUPS = 3
diff --git a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
index e996084b81cd..a53318a94a85 100644
--- a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
@@ -136,6 +136,7 @@ def normalize_tsv_results(self, tsv_data):
     return '\n'.join(sorted(lines_out)) + '\n'
 
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_mergecontacts(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
index 706cff70ba70..d4f540163a38 100644
--- a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
@@ -49,6 +49,7 @@ def get_wordcount_results(self, result_path):
     return results
 
   @pytest.mark.examples_postcommit
+  @pytest.mark.sickbay_flink
   def test_multiple_output_pardo(self):
     test_pipeline = TestPipeline(is_integration_test=True)
 
diff --git a/sdks/python/test-suites/portable/common.gradle b/sdks/python/test-suites/portable/common.gradle
index 9585d0922046..c87696793f0f 100644
--- a/sdks/python/test-suites/portable/common.gradle
+++ b/sdks/python/test-suites/portable/common.gradle
@@ -317,9 +317,6 @@ project.tasks.register("postCommitPy${pythonVersionSuffix}IT") {
             // suppress metric name collision warning logs
             '\\"org.apache.flink.runtime.metrics.groups\\":\\"ERROR\\"}'
     ]
-    if (project.hasProperty('flinkConfDir')) {
-      pipelineOpts += ["--flink-conf-dir=${project.property('flinkConfDir')}"]
-    }
     def cmdArgs = mapToArgString([
             "test_opts": testOpts,
             "suite": "postCommitIT-flink-py${pythonVersionSuffix}",