diff --git a/scripts/create-vms-cord.sh b/scripts/create-vms-cord.sh
index c00eacb..d456525 100755
--- a/scripts/create-vms-cord.sh
+++ b/scripts/create-vms-cord.sh
@@ -31,10 +31,15 @@
 		else
 			uvt-kvm create $NAME --cpu=$CPU --memory=$MEM_MB --disk=$DISK_GB --bridge mgmtbr
 		fi
-		uvt-kvm wait --insecure $NAME
+		# uvt-kvm wait --insecure $NAME
 	fi
 }
 
+function wait-for-vm {
+	NAME=$1
+	uvt-kvm wait --insecure $NAME
+}
+
 create-vm juju 1 2048 20
 create-vm mysql 2 4096 40
 create-vm rabbitmq-server 2 4096 40
@@ -52,3 +57,22 @@
 then
 	create-vm nova-compute 2 4096 100
 fi
+
+# Wait for everything to get set up
+wait-for-vm juju
+wait-for-vm mysql
+wait-for-vm rabbitmq-server
+wait-for-vm keystone
+wait-for-vm glance
+wait-for-vm nova-cloud-controller
+wait-for-vm neutron-api
+wait-for-vm openstack-dashboard
+wait-for-vm ceilometer
+wait-for-vm nagios
+
+wait-for-vm xos
+wait-for-vm onos-cord
+if $TESTING
+then
+	wait-for-vm nova-compute
+fi