diff --git a/container/common/python3.yaml b/container/common/python3.yaml
new file mode 100644
index 0000000..f0877fc
--- /dev/null
+++ b/container/common/python3.yaml
@@ -0,0 +1,18 @@
+schemaVersion: "2.0.0"
+
+fileExistenceTests:
+- name: 'python3'
+  path: '/opt/python3.6/bin/python3'
+  shouldExist: true
+- name: 'pycache3.5'
+  path: '/usr/lib/python3.5/__pycache__'
+  shouldExist: false
+- name: 'pycache3.5-test'
+  path: '/usr/lib/python3.5/test/__pycache__'
+  shouldExist: false
+
+commandTests:
+- name: 'python3-version'
+  command: 'python3'
+  args: ['-V']
+  expectedOutput: ['Python 3.6.*']
diff --git a/container/debian8/builders/bazel/BUILD b/container/debian8/builders/bazel/BUILD
index 28a9531..066e7c7 100644
--- a/container/debian8/builders/bazel/BUILD
+++ b/container/debian8/builders/bazel/BUILD
@@ -74,6 +74,7 @@
         ":container.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common/clang:clang.yaml",
         "//container/common/bazel:bazel_%s.yaml" % bazel_version,
         "//container/common/bazel:bazel_tools.yaml",
diff --git a/container/debian8/builders/rbe-debian8/BUILD b/container/debian8/builders/rbe-debian8/BUILD
index a7c08af..7bc3892 100644
--- a/container/debian8/builders/rbe-debian8/BUILD
+++ b/container/debian8/builders/rbe-debian8/BUILD
@@ -76,6 +76,7 @@
         "//container/common:go.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common:rbe-base.yaml",
         "//container/common/clang:clang.yaml",
         "//container/debian8:debian8.yaml",
diff --git a/container/debian8/builders/rbe-debian8/rbe-debian8.yaml b/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
index 256d813..2cbc113 100644
--- a/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
+++ b/container/debian8/builders/rbe-debian8/rbe-debian8.yaml
@@ -1,17 +1,8 @@
 schemaVersion: "2.0.0"
 
-fileExistenceTests:
-- name: 'Python3'
-  path: '/opt/python3.6/bin/python3'
-  shouldExist: true
-
-commandTests:
-- name: 'python3-version'
-  command: 'python3'
-  args: ['-V']
-  expectedOutput: ['Python 3.6.*']
 # This is failing in Debian9 base. Once resolved, move this test to
 # container/common/rbe-base.yaml.
+commandTests:
 - name: 'check-curl'
   command: 'curl'
   args: ['--version']
diff --git a/container/experimental/rbe-debian8/BUILD b/container/experimental/rbe-debian8/BUILD
index fae54f3..e1c9414 100644
--- a/container/experimental/rbe-debian8/BUILD
+++ b/container/experimental/rbe-debian8/BUILD
@@ -126,6 +126,7 @@
         "//container/common:go.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common:rbe-base.yaml",
         "//container/common/clang:clang.yaml",
         "//container/debian8:debian8.yaml",
diff --git a/container/ubuntu16_04/builders/bazel/BUILD b/container/ubuntu16_04/builders/bazel/BUILD
index 991275d..0a75eed 100644
--- a/container/ubuntu16_04/builders/bazel/BUILD
+++ b/container/ubuntu16_04/builders/bazel/BUILD
@@ -74,6 +74,7 @@
         ":container.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common/clang:clang.yaml",
         "//container/common/bazel:bazel_%s.yaml" % bazel_version,
         "//container/common/bazel:bazel_tools.yaml",
diff --git a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
index 3cb3faa..76bc767 100644
--- a/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
+++ b/container/ubuntu16_04/builders/bazel_docker_gcloud/BUILD
@@ -69,6 +69,7 @@
         ":container.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common/clang:clang.yaml",
         "//container/common/bazel:bazel_%s.yaml" % bazel_version,
         "//container/common/bazel:bazel_tools.yaml",
diff --git a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
index 876dac0..7efcd0c 100644
--- a/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
+++ b/container/ubuntu16_04/builders/rbe-ubuntu16_04/BUILD
@@ -78,6 +78,7 @@
         "//container/common:go.yaml",
         "//container/common:java.yaml",
         "//container/common:python2.yaml",
+        "//container/common:python3.yaml",
         "//container/common:rbe-base.yaml",
         "//container/common/clang:clang.yaml",
         "//container/ubuntu16_04:ubuntu16_04.yaml",
diff --git a/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml b/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
index 256d813..2cbc113 100644
--- a/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
+++ b/container/ubuntu16_04/builders/rbe-ubuntu16_04/rbe-ubuntu16_04.yaml
@@ -1,17 +1,8 @@
 schemaVersion: "2.0.0"
 
-fileExistenceTests:
-- name: 'Python3'
-  path: '/opt/python3.6/bin/python3'
-  shouldExist: true
-
-commandTests:
-- name: 'python3-version'
-  command: 'python3'
-  args: ['-V']
-  expectedOutput: ['Python 3.6.*']
 # This is failing in Debian9 base. Once resolved, move this test to
 # container/common/rbe-base.yaml.
+commandTests:
 - name: 'check-curl'
   command: 'curl'
   args: ['--version']