diff --git a/test/vm-cluster/cluster.sh b/test/vm-cluster/cluster.sh
index 1923de7d..1cdb4bd3 100755
--- a/test/vm-cluster/cluster.sh
+++ b/test/vm-cluster/cluster.sh
@@ -114,7 +114,8 @@ if [ $mode = "ssl" ]; then
     popd > /dev/null 2>&1
     
     echo "Sending tls certs to the contract..."
-    sshpass -f vmpass.txt scp ~/Downloads/$vmaddr/certs/* geveo@$vmaddr:~/contract/cfg/
+    sshpass -f vmpass.txt scp ~/Downloads/$vmaddr/certs/* geveo@$vmaddr:~/hpfiles/ssl/
+    sshpass -f vmpass.txt ssh geveo@$vmaddr 'cp -rf ~/hpfiles/ssl/* ~/contract/cfg/'
     
     rm -r ~/Downloads/$vmaddr
     echo "Done"
@@ -142,7 +143,7 @@ fi
 if [ $mode = "new" ] || [ $mode = "update" ]; then
 
     # Copy required files to hpfiles dir.
-    mkdir -p hpfiles/{bin,nodejs_contract}
+    mkdir -p hpfiles/{bin,ssl,nodejs_contract}
     strip $hpcore/build/hpcore
     cp $hpcore/build/hpcore hpfiles/bin/
     cp $hpcore/examples/nodejs_contract/{package.json,echo_contract.js,hp-contract-lib.js} hpfiles/nodejs_contract/
@@ -234,7 +235,7 @@ do
         binargs:'/home/geveo/hpfiles/nodejs_contract/echo_contract.js', \
         peers:${mypeers}, \
         unl:${myunl}, \
-        roundtime: 2000, \
+        roundtime: 1000, \
         loglevel: 'debug', \
         loggers:['console', 'file'] \
         }, null, 2)" > ./cfg/node$n.cfg
diff --git a/test/vm-cluster/setup-hp.sh b/test/vm-cluster/setup-hp.sh
index b137eb3f..7eb882ba 100755
--- a/test/vm-cluster/setup-hp.sh
+++ b/test/vm-cluster/setup-hp.sh
@@ -34,8 +34,13 @@ sudo rm -r ~/contract > /dev/null 2>&1
 echo "Creating new contract directory..."
 ~/hpfiles/bin/hpcore new ~/contract
 
-pushd ~/contract/cfg > /dev/null 2>&1
-echo "Generating default ssl certs..."
-openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout tlskey.pem -out tlscert.pem \
-      -subj "/C=AU/ST=ST/L=L/O=O/OU=OU/CN=localhost/emailAddress=hp@example" > /dev/null 2>&1
-popd > /dev/null 2>&1
+if [ -f ~/hpfiles/ssl/tlscert.pem ]; then
+   echo "Copying ssl certs to contract directory..."
+   cp -rf ~/hpfiles/ssl/* ~/contract/cfg/
+else
+   echo "Generating default ssl certs..."
+   pushd ~/contract/cfg > /dev/null 2>&1
+   openssl req -newkey rsa:2048 -new -nodes -x509 -days 3650 -keyout tlskey.pem -out tlscert.pem \
+         -subj "/C=AU/ST=ST/L=L/O=O/OU=OU/CN=localhost/emailAddress=hp@example" > /dev/null 2>&1
+   popd > /dev/null 2>&1
+fi