diff --git a/test-network/network.sh b/test-network/network.sh
index bcafe447..4f3818c1 100755
--- a/test-network/network.sh
+++ b/test-network/network.sh
@@ -236,7 +236,14 @@ function createOrgs() {
 
     . organizations/fabric-ca/registerEnroll.sh
 
-    sleep 10
+  while :
+    do
+      if [ ! -f "organizations/fabric-ca/org1/tls-cert.pem" ]; then
+        sleep 1
+      else
+        break
+      fi
+    done
 
     infoln "Create Org1 Identities"