diff --git a/build_library/sysext_mangle_flatcar-python b/build_library/sysext_mangle_flatcar-python
index 47dc37e2e1..6ac2f2a018 100755
--- a/build_library/sysext_mangle_flatcar-python
+++ b/build_library/sysext_mangle_flatcar-python
@@ -7,4 +7,14 @@ pushd "${rootfs}"
 
 rm -rf ./usr/{lib/debug,share,include,lib64/pkgconfig}
 
+# Remove test stuff from python - it's quite large.
+for p in ./usr/lib/python*; do
+    if [[ ! -d ${p} ]]; then
+        continue
+    fi
+    # find directories named tests or test and remove them (-prune
+    # avoids searching below those directories)
+    find "${p}" \( -name tests -o -name test \) -type d -prune -exec rm -rf '{}' '+'
+done
+
 popd
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/manglefs.sh
index 29331dde04..aa6a58967f 100755
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/manglefs.sh
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-azure/files/manglefs.sh
@@ -20,3 +20,13 @@ ln -sf /usr/bin/true "${rootfs}/usr/bin/eject"
 # both cases, so mangle manually.
 mkdir -p "${rootfs}"/usr/lib/systemd/system
 cp -a "${rootfs}"/{etc,usr/lib}/systemd/system/.
+
+# Remove test stuff from python - it's quite large.
+for p in "${rootfs}"/usr/lib/python*; do
+    if [[ ! -d ${p} ]]; then
+        continue
+    fi
+    # find directories named tests or test and remove them (-prune
+    # avoids searching below those directories)
+    find "${p}" \( -name tests -o -name test \) -type d -prune -exec rm -rf '{}' '+'
+done
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh
new file mode 100755
index 0000000000..b4db342cbe
--- /dev/null
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/files/manglefs.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -euo pipefail
+
+rootfs=${1}
+
+# Remove test stuff from python - it's quite large.
+for p in "${rootfs}"/usr/lib/python*; do
+    if [[ ! -d ${p} ]]; then
+        continue
+    fi
+    # find directories named tests or test and remove them (-prune
+    # avoids searching below those directories)
+    find "${p}" \( -name tests -o -name test \) -type d -prune -exec rm -rf '{}' '+'
+done