diff --git a/dockerfiles/services/nginx-php/Dockerfile b/dockerfiles/services/nginx-php/Dockerfile
index 4d0bedc530477af197755395678ecd9c46e74c65..6e135cf8069a482790f939e554daa4820bc8d1ba 100644
--- a/dockerfiles/services/nginx-php/Dockerfile
+++ b/dockerfiles/services/nginx-php/Dockerfile
@@ -16,6 +16,7 @@ RUN apt-get update && apt-get install -y \
     sed -i 's/error_log.*/error_log \/dev\/stdout info;/g' /etc/nginx/nginx.conf && \
     sed -i 's/^pid/daemon off;\npid/g' /etc/nginx/nginx.conf && \
     sed -i "s/.*sendmail_path.*/sendmail_path = \/usr\/sbin\/ssmtp -t/g" /etc/php5/fpm/php.ini && \
+    sed -i 's/;default_charset.*/default_charset = "UTF-8"/g' /etc/php5/fpm/php.ini && \
     sed -i 's/;cgi.fix_pathinfo=1/cgi.fix_pathinfo=0/g' /etc/php5/fpm/php.ini
 
 ADD basic.conf /etc/nginx/conf.d/basic.conf
diff --git a/dockerfiles/services/owncloud/Dockerfile b/dockerfiles/services/owncloud/Dockerfile
index cad3da9745aa2567596b59af61e29ad00c5331cc..6b1a5ec26211c62f4e94037785d3fc86fb1e9d1e 100644
--- a/dockerfiles/services/owncloud/Dockerfile
+++ b/dockerfiles/services/owncloud/Dockerfile
@@ -5,8 +5,7 @@ RUN echo 'deb http://download.opensuse.org/repositories/isv:/ownCloud:/community
     curl -L http://download.opensuse.org/repositories/isv:ownCloud:community/Debian_7.0/Release.key | apt-key add - && \
     apt-get update && apt-get install -y \
       owncloud \
-      php5-imap \
-      sendmail && \
+      php5-imap && \
     apt-get install -y --no-install-recommends \
       libreoffice && \
     rm -rf /var/lib/apt/lists/* && \
diff --git a/scripts/create_vultr.sh b/scripts/create_vultr.sh
index ebafc81f847187fd06c4f6281ea97d9e8aeb76d6..c2a1d38138ae5233c5da549df64604aeb3d6aac8 100755
--- a/scripts/create_vultr.sh
+++ b/scripts/create_vultr.sh
@@ -20,10 +20,12 @@ LABEL=$1
 echo Label: $LABEL
 echo API key: $VULTR_API_KEY
 
+VPSPLANID=${2:-29}
+
 SSHKEYID=`curl -s https://api.vultr.com/v1/sshkey/list\?api_key\=$VULTR_API_KEY | cut -d\" -f2`
 echo Got your ssh key ID $SSHKEYID:
 
-SUBID=`curl -s -d "DCID=24&VPSPLANID=29&OSID=179&label=$LABEL&SSHKEYID=$SSHKEYID" https://api.vultr.com/v1/server/create\?api_key\=$VULTR_API_KEY | cut -d\" -f4`
+SUBID=`curl -s -d "DCID=24&VPSPLANID=$VPSPLANID&OSID=179&label=$LABEL&SSHKEYID=$SSHKEYID" https://api.vultr.com/v1/server/create\?api_key\=$VULTR_API_KEY | cut -d\" -f4`
 echo Got your SUB ID $SUBID:
 
 while :
diff --git a/scripts/start.sh b/scripts/start.sh
index cddbe18deb9e836759a9ba983de7334d6aafb9e2..b0548db67fe027667511f5811bb6e449e9702ccf 100755
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -19,7 +19,7 @@ BACKUP_IP=`cat /etc/hosts | grep backup.test | cut -d" " -f1`
 
 # Create server for tests
 
-$ROOT_DIR/scripts/create_vultr.sh server.test
+$ROOT_DIR/scripts/create_vultr.sh server.test 30
 cat $ROOT_DIR/configs/server.config | sed s/##BACKUP_IP##/$BACKUP_IP/g > /tmp/server.config
 scp /tmp/server.config root@server.test:/var/lib/coreos-install/user_data
 scp $ROOT_DIR/scripts/install.sh root@server.test:/tmp/install.sh
diff --git a/tests/email.sh b/tests/email.sh
index 142af0acce6970f6d8aa81b371addc865c7cd596..00aa2d093c395c9225870488f93ae34a2ef7f2ea 100755
--- a/tests/email.sh
+++ b/tests/email.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -eux
 
 mkdir -p /data/domains/mail/dovecot
-mkdir -p /data/domains/mail/TLS
+mkdir -p /data/domains/mail/TLS/
 mkdir -p /data/domains/mail/static/www-content
 mkdir -p /data/runtime/domains/mail/mysql/db_files
 mkdir -p /data/domains/mail/mysql
@@ -22,7 +22,7 @@ openssl x509 -req -days 365 \
   -in /data/domains/mail/TLS/ssl_cert_sign_req.csr -signkey /data/domains/mail/TLS/ssl_private_key.pem -out /data/domains/mail/TLS/ssl_certificate.pem
 openssl dhparam -out /data/domains/mail/TLS/dh2048.pem 2048
 
-cp /data/domains/mail/TLS/ssl_certificate.pem /data/domains/mail/TLS/mail.pem
+cat /data/domains/mail/TLS/ssl_certificate.pem /data/domains/mail/TLS/ssl_private_key.pem > /data/domains/mail/TLS/mail.pem
 
 systemctl enable dovecot
 systemctl enable postfix