diff --git a/Dockerfile.fedora b/Dockerfile.fedora
index 74a770a90a0..6ec176d103e 100644
--- a/Dockerfile.fedora
+++ b/Dockerfile.fedora
@@ -89,6 +89,10 @@ RUN mkdir -p /etc/containers
 COPY test/policy.json /etc/containers/policy.json
 COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml
 
+# WORKAROUND/HACK (05/30/19): metacopy=on breaks tests using VFS"
+RUN echo "WORKAROUND/HACK (05/30/19): metacopy=on breaks tests using VFS" && \
+    sed -i -r -e 's/^mountopt =.+/mountopt = "nodev"/' /etc/containers/storage.conf
+
 # Install varlink stuff
 RUN pip3 install varlink
 
diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh
index f40405e8d0c..33ff0478c97 100755
--- a/contrib/cirrus/setup_environment.sh
+++ b/contrib/cirrus/setup_environment.sh
@@ -58,6 +58,12 @@ cd "${GOSRC}/"
 # Reload to incorporate any changes from above
 source "$SCRIPT_BASE/lib.sh"
 
+if [[ -r "/etc/containers/storage.conf" ]]
+then
+    echo ">>>>> WORKAROUND/HACK (05/30/19): metacopy=on breaks tests using VFS"
+    sed -i -r -e 's/^mountopt =.+/mountopt = "nodev"/' /etc/containers/storage.conf
+fi
+
 echo "Installing cni config, policy and registry config"
 req_env_var GOSRC
 sudo install -D -m 755 $GOSRC/cni/87-podman-bridge.conflist \