diff --git a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
index ea71321..1560d5b 100644
--- a/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
+++ b/tcp_tests/templates/underlay/virtual-mcp10-ovs--user-data1604.yaml
@@ -25,6 +25,8 @@
     all: '| tee -a /var/log/cloud-init-output.log /dev/tty0'
 
   runcmd:
+   - export TERM=linux
+   - export LANG=C
    # Configure dhclient
    - sudo echo "nameserver {gateway}" >> /etc/resolvconf/resolv.conf.d/base
    - sudo resolvconf -u
@@ -70,8 +72,8 @@
    - apt-get install -y salt-minion
 
    # To be configured from inventory/fuel-devops by operator or autotests
-   - 'echo "id: {hostname}" >> /etc/salt/minion'
-   - 'echo "master: 172.16.10.100" >> /etc/salt/minion'
+   - 'echo "id: {hostname}" >> /etc/salt/minion.d/minion.conf'
+   - 'echo "master: 172.16.10.100" >> /etc/salt/minion.d/minion.conf'
 
    - echo "Restarting minion service with workarounds..."
    - rm -f /etc/salt/pki/minion/minion_master.pub