diff --git a/tests/vmcheck/multitest.py b/tests/vmcheck/multitest.py
index 4d14b02413..ffec4fb2fd 100755
--- a/tests/vmcheck/multitest.py
+++ b/tests/vmcheck/multitest.py
@@ -102,10 +102,12 @@ def flush(self):
         rc = self._p.wait()
 
         # just merge the two files
-        with open("vmcheck/%s.out" % self.test) as f:
-            with open("vmcheck/%s.log" % self.test, 'a') as j:
-                j.write(f.read())
-        os.remove("vmcheck/%s.out" % self.test)
+        outfile = "vmcheck/{}.out".format(self.test)
+        if os.path.isfile(outfile):
+            with open(outfile) as f:
+                with open("vmcheck/%s.log" % self.test, 'a') as j:
+                    j.write(f.read())
+            os.remove(outfile)
 
         rcs = "PASS" if rc == 0 else ("FAIL (rc %d)" % rc)
         print("%s: %s" % (rcs, self.test))
diff --git a/tests/vmcheck/overlay.sh b/tests/vmcheck/overlay.sh
index e0add01357..3af15526f0 100755
--- a/tests/vmcheck/overlay.sh
+++ b/tests/vmcheck/overlay.sh
@@ -59,19 +59,11 @@ fi
 cd /ostree/repo/tmp
 rm vmcheck -rf
 ostree checkout $commit vmcheck --fsync=0
+# ✀✀✀ BEGIN hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀
+rm -f vmcheck/usr/etc/{.pwd.lock,passwd-,group-,shadow-,gshadow-,subuid-,subgid-}
+# ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/693 ✀✀✀
+# Now, overlay our built binaries
 rsync -rlv /var/roothome/sync/insttree/usr/ vmcheck/usr/
-# ✀✀✀ BEGIN hack for https://github.com/projectatomic/rpm-ostree/pull/642 ✀✀✀
-ostree admin unlock || true
-for url in https://kojipkgs.fedoraproject.org//packages/ostree/2017.2/3.fc25/x86_64/ostree-{,libs-,grub2-}2017.2-3.fc25.x86_64.rpm; do
-    curl -sSL -O $url
-done
-rpm -Uvh --force *.rpm
-for x in *.rpm; do
-    rpm2cpio $x | (cd vmcheck && cpio -div)
-done
-rm vmcheck/etc -rf
-rm -f *.rpm
-# ✀✀✀ END hack for https://github.com/projectatomic/rpm-ostree/pull/642 ✀✀✀
 ostree refs --delete vmcheck || true
 ostree commit -b vmcheck -s '' --tree=dir=vmcheck --link-checkout-speedup
 ostree admin deploy vmcheck