diff --git a/.gitignore b/.gitignore
index 5582d6763..02e6fcbb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ packer-builder-vsphere*
 bin/
 test*.json
 crash.log
+vpn/
diff --git a/docker-compose.yml b/docker-compose.yml
index b31739c80..0da375c32 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,16 @@
-build:
+version: '2'
+services:
+  build:
     image: jetbrainsinfra/golang:1.9.4
     volumes:
-        - .:/go/src/github.com/jetbrains-infra/packer-builder-vsphere
+      - .:/go/src/github.com/jetbrains-infra/packer-builder-vsphere
     working_dir: /go/src/github.com/jetbrains-infra/packer-builder-vsphere
     command: ./build.sh
+
+  test:
+    image: jetbrainsinfra/golang:1.9.4
+    volumes:
+      - .:/go/src/github.com/jetbrains-infra/packer-builder-vsphere
+    working_dir: /go/src/github.com/jetbrains-infra/packer-builder-vsphere
+#    network_mode: "container:vpn"
+    command: ./test.sh
diff --git a/teamcity-services.yml b/teamcity-services.yml
new file mode 100644
index 000000000..ab018745f
--- /dev/null
+++ b/teamcity-services.yml
@@ -0,0 +1,13 @@
+version: '2'
+services:
+  vpn:
+    container_name: vpn
+    image: jetbrainsinfra/openvpn
+    volumes:
+      - ./vpn:/vpn:ro
+    cap_add:
+      - NET_ADMIN
+    devices:
+      - /dev/net/tun:/dev/net/tun
+    dns: 10.0.0.1
+    command: --config /vpn/jetbrains-vsphere-lab.ovpn --script-security 2 --auth-user-pass /vpn/creds.txt