diff --git a/oem/ami/test_ami.sh b/oem/ami/test_ami.sh
index 65b99fcdc4..c236306df2 100755
--- a/oem/ami/test_ami.sh
+++ b/oem/ami/test_ami.sh
@@ -156,6 +156,9 @@ for host in ${ips[@]}; do
 done
 echo "OK ($instances)"
 
+echo "Letting etcd settle..."
+sleep 10
+
 echo "Running coretest..."
 for host in ${ips[@]}; do
     if ! ssh -i "$key_file" -l core -o StrictHostKeyChecking=no "$host" \
@@ -168,7 +171,7 @@ done
 echo "OK"
 
 echo -n "Testing etcd... "
-test_key="v1/keys/test"
+test_key="v2/keys/test"
 token=$(uuidgen)
 # XXX: the sleep *should never* be required, this is a bug in etcd
 sleep 5