diff --git a/templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template
similarity index 100%
rename from templates/tools/dockerfile/test/python_stretch_27_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template
similarity index 100%
rename from templates/tools/dockerfile/test/python_stretch_35_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template
similarity index 100%
rename from templates/tools/dockerfile/test/python_stretch_36_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile.template
diff --git a/templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template b/templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template
similarity index 100%
rename from templates/tools/dockerfile/test/python_stretch_37_x64/Dockerfile.template
rename to templates/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile.template
diff --git a/tools/dockerfile/test/python_stretch_27_x64/Dockerfile b/tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
similarity index 100%
rename from tools/dockerfile/test/python_stretch_27_x64/Dockerfile
rename to tools/dockerfile/test/python_stretch_2.7_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_35_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
similarity index 100%
rename from tools/dockerfile/test/python_stretch_35_x64/Dockerfile
rename to tools/dockerfile/test/python_stretch_3.5_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_36_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
similarity index 100%
rename from tools/dockerfile/test/python_stretch_36_x64/Dockerfile
rename to tools/dockerfile/test/python_stretch_3.6_x64/Dockerfile
diff --git a/tools/dockerfile/test/python_stretch_37_x64/Dockerfile b/tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
similarity index 100%
rename from tools/dockerfile/test/python_stretch_37_x64/Dockerfile
rename to tools/dockerfile/test/python_stretch_3.7_x64/Dockerfile
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index 5dcdd3700c8..b7ed529762a 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -762,7 +762,7 @@ class PythonLanguage(object):
         if self.args.compiler in [
                 'python2.7', 'python3.5', 'python3.6', 'python3.7'
         ]:
-            return 'stretch_%s' % re.sub(r'\D*', '', self.args.compiler)
+            return 'stretch_' + self.args.compiler[len('python'):]
         elif self.args.compiler == 'python_alpine':
             return 'alpine'
         else: