diff --git a/weave b/weave
index f9a237c1..2dea13b2 100755
--- a/weave
+++ b/weave
@@ -115,7 +115,7 @@ docker_run_options() {
     echo --privileged --net=host $(docker_sock_options)
 }
 
-docker_exec_cni_options() {
+cni_volume_options() {
     [ "$1" = "setup" ] && echo -v /etc/cni:/etc/cni -v /opt/cni:/opt/cni
 }
 
@@ -124,7 +124,7 @@ create_cni_script() {
 #!/bin/sh
 docker run --rm --privileged --net=host --pid=host -i \\
  -e CNI_VERSION -e CNI_COMMAND -e CNI_CONTAINERID -e CNI_NETNS \\
- -e CNI_IFNAME -e CNI_ARGS -e CNI_PATH \\
+ -e CNI_IFNAME -e CNI_ARGS -e CNI_PATH $(cni_volume_options setup) \\
  $PLUGIN_IMAGE "$2"
 EOF
     chmod a+x "$1"
@@ -143,7 +143,7 @@ exec_remote() {
     docker $DOCKER_CLIENT_ARGS run --rm \
         $(docker_run_options) \
         --pid=host \
-        $(docker_exec_cni_options "$@") \
+        $(cni_volume_options "$@") \
         -e DOCKERHUB_USER="$DOCKERHUB_USER" \
         -e WEAVE_VERSION \
         -e WEAVE_DEBUG \