diff --git a/ci/build-check.sh b/ci/build-check.sh
index 743bf364af..75d2545a37 100755
--- a/ci/build-check.sh
+++ b/ci/build-check.sh
@@ -27,7 +27,11 @@ fi
 ${dn}/build.sh
 # NB: avoid make function because our RPM building doesn't
 # support parallel runs right now
-/usr/bin/make check
+# See https://github.com/containers/fuse-overlayfs/pull/105 for the fuse-overlayfs workaround
+if ! [ "$(findmnt -n -o SOURCE /)" != fuse-overlayfs ]; then
+    /usr/bin/make check
+fi
+make rust-test
 make install
 
 # And now a clang build with -Werror turned on. We can't do this with gcc (in
diff --git a/ci/installdeps.sh b/ci/installdeps.sh
index 85f223adaf..5f02d4c7ab 100755
--- a/ci/installdeps.sh
+++ b/ci/installdeps.sh
@@ -6,6 +6,10 @@ set -xeuo pipefail
 dn=$(dirname $0)
 . ${dn}/libbuild.sh
 
+if [ -n "${SKIP_INSTALLDEPS:-}" ]; then
+    exit 0
+fi
+
 # Use the latest ostree by default (XXX: currently pulling in f29 ostree, need
 # to bump rdgo to f30 or wait for packit)
 id=$(. /etc/os-release && echo $ID)
diff --git a/ci/prow/Dockerfile b/ci/prow/Dockerfile
index b1f83c0190..7decc085f2 100644
--- a/ci/prow/Dockerfile
+++ b/ci/prow/Dockerfile
@@ -1,4 +1,5 @@
-FROM registry.fedoraproject.org/fedora:30
+FROM registry.svc.ci.openshift.org/coreos/cosa-buildroot:latest
 WORKDIR /src
 COPY . .
-RUN ./ci/build.sh
+USER root
+RUN env SKIP_INSTALLDEPS=1 ./ci/build-check.sh