diff --git a/scripts/wait-for-tiworker.ps1 b/scripts/wait-for-tiworker.ps1
new file mode 100755
index 0000000000000000000000000000000000000000..3a9e7ceabe5c9fe8a3e7da104152a3db35c2240e
--- /dev/null
+++ b/scripts/wait-for-tiworker.ps1
@@ -0,0 +1,17 @@
+$procname="TiWorker"
+
+$finished = 0
+
+while ($finished -lt 3) {
+
+  Start-Sleep 30
+  Write-Output "Checking for $procname ($finished)"
+  $output = "$(get-process -erroraction silentlycontinue $procname)"
+  if ( $output -eq "") {
+    $finished = $finished + 1
+  } else {
+    $finished = 0
+  }
+
+}
+
diff --git a/windows_2016_docker.json b/windows_2016_docker.json
index 0105a43cf3f5d2ae4ae0f1360b3ba8b940c3fe9f..28251e92dcaa7517a329081a720f18780969e3ce 100644
--- a/windows_2016_docker.json
+++ b/windows_2016_docker.json
@@ -147,6 +147,7 @@
         "./scripts/docker/add-docker-group.ps1",
         "./scripts/docker/install-docker.ps1",
         "./scripts/docker/docker-pull.ps1",
+        "./scripts/wait-for-tiworker.ps1",
         "./scripts/docker/open-docker-insecure-port.ps1",
         "./scripts/docker/open-docker-swarm-ports.ps1",
         "./scripts/docker/remove-docker-key-json.ps1",