diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 43c504abdb49..5637dbfed053 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1602,7 +1602,7 @@ class BeamModulePlugin implements Plugin<Project> {
         doLast {
           project.exec {
             executable 'sh'
-            args '-c', ". ${project.ext.envdir}/bin/activate && python ${pythonRootDir}/setup.py sdist --formats zip,gztar --dist-dir ${project.buildDir}"
+            args '-c', ". ${project.ext.envdir}/bin/activate && cd ${pythonRootDir} && python setup.py sdist --formats zip,gztar --dist-dir ${project.buildDir}"
           }
           def collection = project.fileTree("${project.buildDir}"){ include '**/*.tar.gz' exclude '**/apache-beam.tar.gz'}
           println "sdist archive name: ${collection.singleFile}"
diff --git a/sdks/python/precommit/dataflow/build.gradle b/sdks/python/precommit/dataflow/build.gradle
index 59072b7406c6..f61a40d03666 100644
--- a/sdks/python/precommit/dataflow/build.gradle
+++ b/sdks/python/precommit/dataflow/build.gradle
@@ -34,10 +34,14 @@ task preCommitIT(dependsOn: ['sdist', 'installGcpTest']) {
         "--processes=2",    // Number of tests running in parallel
         "--process-timeout=1800",   // Timeout of whole command execution
     ]
+    def cmdArgs = project.mapToArgString([
+        "test_opts": testOpts,
+        "sdk_location": "${project.buildDir}/apache-beam.tar.gz"
+    ])
 
     exec {
       executable 'sh'
-      args '-c', ". ${project.ext.envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh --test_opts \"${testOpts.join(' ')}\""
+      args '-c', ". ${project.ext.envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh $cmdArgs"
     }
   }
 }
diff --git a/sdks/python/precommit/dataflow/py3/build.gradle b/sdks/python/precommit/dataflow/py3/build.gradle
index 9d343d5fe130..7f0fa761f00e 100644
--- a/sdks/python/precommit/dataflow/py3/build.gradle
+++ b/sdks/python/precommit/dataflow/py3/build.gradle
@@ -33,8 +33,13 @@ task preCommitIT(dependsOn: ['sdist', 'installGcpTest']) {
     def testOpts = [
         "--tests=${tests.join(',')}",
         "--nocapture",    // Print stdout instantly
+        "--processes=1",    // Number of tests running in parallel
+        "--process-timeout=1800",   // Timeout of whole command execution
     ]
-    def cmdArgs = project.mapToArgString(["test_opts": testOpts])
+    def cmdArgs = project.mapToArgString([
+        "test_opts": testOpts,
+        "sdk_location": "${project.buildDir}/apache-beam.tar.gz"
+    ])
     exec {
       executable 'sh'
       args '-c', ". ${project.ext.envdir}/bin/activate && ${runScriptsDir}/run_integration_test.sh $cmdArgs"