diff --git a/hack/lib/etcd.sh b/hack/lib/etcd.sh
index cf0253ed76f75..0defac3133939 100644
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -50,5 +50,6 @@ kube::etcd::start() {
 
 kube::etcd::cleanup() {
   kill "${ETCD_PID-}" >/dev/null 2>&1 || :
+  wait "${ETCD_PID-}" >/dev/null 2>&1 || :
   rm -rf "${ETCD_DIR-}"
 }