diff --git a/tools/cleanup-host b/tools/cleanup-host
index 3cc4ae23d5..18353c7b1f 100755
--- a/tools/cleanup-host
+++ b/tools/cleanup-host
@@ -3,7 +3,7 @@
 # Move to top level directory
 REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
 cd "$(dirname "$REAL_PATH")/.."
-. tools/validate-docker-execute
+. tools/validate-docker-execute.sh
 
 # Spawning the neutron-agents container leaves artifacts on the host.
 # This script removes these artifacts.
diff --git a/tools/cleanup-images b/tools/cleanup-images
index 871afd1d1a..0650052207 100755
--- a/tools/cleanup-images
+++ b/tools/cleanup-images
@@ -4,7 +4,7 @@
 REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")
 cd "$(dirname "$REAL_PATH")/.."
 
-. tools/validate-docker-execute
+. tools/validate-docker-execute.sh
 
 IMAGES=`docker images -a -q`
 if [[ -z "$IMAGES" ]]; then
diff --git a/tools/validate-docker-execute b/tools/validate-docker-execute.sh
similarity index 100%
rename from tools/validate-docker-execute
rename to tools/validate-docker-execute.sh