diff --git a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template b/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
index ba8f03862c8fbe29ab263e5a6ef37c3a7f0578fb..49371aaa3bbc6abbff53f510528304e81c2e22e2 100644
--- a/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
+++ b/templates/tools/dockerfile/test/cxx_squeeze_x64/Dockerfile.template
@@ -40,7 +40,8 @@
   RUN pip install argparse
 
   RUN wget ${openssl_fallback.base_uri + openssl_fallback.tarball}
-  ADD post-git-setup.sh /
+
+  ENV POST_GIT_STEP tools/dockerfile/test/cxx_squeeze_x64/post-git-setup.sh
 
   <%include file="../../run_tests_addons.include" args="skip_zookeeper=True"/>
   # Define the default command.
diff --git a/tools/jenkins/docker_run.sh b/tools/jenkins/docker_run.sh
index 850249a9a2be716005ae3a738463d3405e6d3d90..df7b6571d7a455a0a2f02498d300371a17579d0d 100755
--- a/tools/jenkins/docker_run.sh
+++ b/tools/jenkins/docker_run.sh
@@ -42,8 +42,6 @@ else
   cp -r "$EXTERNAL_GIT_ROOT/$RELATIVE_COPY_PATH"/* "/var/local/git/grpc/$RELATIVE_COPY_PATH"
 fi
 
-[ -e /post-git-setup.sh ] && /post-git-setup.sh
-
 if [ -x "$(command -v rvm)" ]
 then
   rvm use ruby-2.1
diff --git a/tools/jenkins/docker_run_tests.sh b/tools/jenkins/docker_run_tests.sh
index 178f2736418d7d9d85e723474049c7f860573cd1..1b93b1d49258bd99ac6dc7a9816969aa61f660b7 100755
--- a/tools/jenkins/docker_run_tests.sh
+++ b/tools/jenkins/docker_run_tests.sh
@@ -43,10 +43,10 @@ chown $(whoami) $XDG_CACHE_HOME
 mkdir -p /var/local/git
 git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
 
-[ -e /post-git-setup.sh ] && /post-git-setup.sh
-
 mkdir -p reports
 
+$POST_GIT_STEP
+
 exit_code=0
 
 $RUN_TESTS_COMMAND || exit_code=$?