diff --git a/build.gradle b/build.gradle
index c114854f8bb5..99a49275c046 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,6 +219,8 @@ task python3PostCommit() {
 task portablePythonPreCommit() {
   dependsOn "sdks:python:portablePreCommitPy2"
   dependsOn "sdks:python:test-suites:portable:py35:portablePreCommitPy35"
+  dependsOn "sdks:python:test-suites:portable:py36:portablePreCommitPy36"
+  dependsOn "sdks:python:test-suites:portable:py37:portablePreCommitPy37"
 }
 
 task websitePreCommit() {
diff --git a/sdks/python/test-suites/portable/py36/build.gradle b/sdks/python/test-suites/portable/py36/build.gradle
new file mode 100644
index 000000000000..757cde7fc28b
--- /dev/null
+++ b/sdks/python/test-suites/portable/py36/build.gradle
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: org.apache.beam.gradle.BeamModulePlugin
+applyPythonNature()
+// Required to setup a Python 3.6 virtualenv.
+pythonVersion = '3.6'
+
+addPortableWordCountTasks()
+
+task portablePreCommitPy36() {
+    dependsOn ':runners:flink:1.5:job-server-container:docker'
+    dependsOn ':sdks:python:container:py3:docker'
+    dependsOn portableWordCountBatch
+    dependsOn portableWordCountStreaming
+}
+
diff --git a/sdks/python/test-suites/portable/py37/build.gradle b/sdks/python/test-suites/portable/py37/build.gradle
new file mode 100644
index 000000000000..0fb3fdb5ade1
--- /dev/null
+++ b/sdks/python/test-suites/portable/py37/build.gradle
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: org.apache.beam.gradle.BeamModulePlugin
+applyPythonNature()
+// Required to setup a Python 3.7 virtualenv.
+pythonVersion = '3.7'
+
+addPortableWordCountTasks()
+
+task portablePreCommitPy37() {
+    dependsOn ':runners:flink:1.5:job-server-container:docker'
+    dependsOn ':sdks:python:container:py3:docker'
+    dependsOn portableWordCountBatch
+    dependsOn portableWordCountStreaming
+}
+
diff --git a/settings.gradle b/settings.gradle
index 4220945f1acc..00947a1519c7 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -133,6 +133,8 @@ include ":sdks:python:test-suites:direct:py35"
 include ":sdks:python:test-suites:direct:py36"
 include ":sdks:python:test-suites:direct:py37"
 include ":sdks:python:test-suites:portable:py35"
+include ":sdks:python:test-suites:portable:py36"
+include ":sdks:python:test-suites:portable:py37"
 include ":sdks:python:test-suites:tox:py35"
 include ":sdks:python:test-suites:tox:py36"
 include ":sdks:python:test-suites:tox:py37"