diff --git a/validation-scripts/all-nodes.sh b/validation-scripts/all-nodes.sh
index fcbfcc95d2..8057f2013d 100644
--- a/validation-scripts/all-nodes.sh
+++ b/validation-scripts/all-nodes.sh
@@ -2,7 +2,7 @@
 
 # For each unique remote IP (specified via Heat) we check to
 # see if one of the locally configured networks matches and if so we
-# attempt a ping test on that networks remote IP.
+# attempt a ping test the remote network IP.
 function ping_controller_ips() {
   local REMOTE_IPS=$1
 
@@ -26,4 +26,22 @@ function ping_controller_ips() {
   done
 }
 
+# Ping all default gateways. There should only be one
+# if using upstream t-h-t network templates but we test
+# all of them should some manual network config have
+# multiple gateways.
+function ping_default_gateways() {
+  DEFAULT_GW=$(ip r | grep ^default | cut -d " " -f 3)
+  for GW in $DEFAULT_GW; do
+    echo -n "Trying to ping default gateway ${GW}..."
+    if ! ping -c 1 $GW &> /dev/null; then
+      echo "FAILURE"
+      echo "$GW is not pingable."
+      exit 1
+    fi
+  done
+  echo "SUCCESS"
+}
+
 ping_controller_ips "$ping_test_ips"
+ping_default_gateways