diff --git a/hack/.shellcheck_failures b/hack/.shellcheck_failures
index 63ba8fb6ea..f7ff930d77 100644
--- a/hack/.shellcheck_failures
+++ b/hack/.shellcheck_failures
@@ -122,8 +122,6 @@
 ./test/images/volume/nfs/run_nfs.sh
 ./test/images/volume/rbd/bootstrap.sh
 ./test/images/volume/rbd/create_block.sh
-./test/images/volume/rbd/mon.sh
-./test/images/volume/rbd/osd.sh
 ./third_party/forked/shell2junit/sh2ju.sh
 ./third_party/intemp/intemp.sh
 ./third_party/multiarch/qemu-user-static/register/qemu-binfmt-conf.sh
diff --git a/test/images/volume/rbd/mon.sh b/test/images/volume/rbd/mon.sh
index 6865eef650..21c4ee6438 100755
--- a/test/images/volume/rbd/mon.sh
+++ b/test/images/volume/rbd/mon.sh
@@ -19,7 +19,7 @@
 #
 
 # monitor setup
-monmaptool --create --clobber --fsid `uuidgen` --add a $1:6789 /etc/ceph/monmap
+monmaptool --create --clobber --fsid "$(uuidgen)" --add a "${1}":6789 /etc/ceph/monmap
 mkdir /var/lib/ceph/mon/ceph-a
 ceph-mon -i a --mkfs --monmap /etc/ceph/monmap -k /var/lib/ceph/mon/keyring
 cp /var/lib/ceph/mon/keyring /var/lib/ceph/mon/ceph-a
diff --git a/test/images/volume/rbd/osd.sh b/test/images/volume/rbd/osd.sh
index 9c58ef4c7c..f86d3d1731 100755
--- a/test/images/volume/rbd/osd.sh
+++ b/test/images/volume/rbd/osd.sh
@@ -19,7 +19,7 @@
 #
 
 ceph osd create
-ceph-osd -i $1 --mkfs --mkkey
-ceph auth add osd.$1 osd 'allow *' mon 'allow rwx' -i /var/lib/ceph/osd/ceph-$1/keyring
-ceph osd crush add $1 1 root=default host=cephbox
-ceph-osd -i $1 -k /var/lib/ceph/osd/ceph-$1/keyring
+ceph-osd -i "${1}" --mkfs --mkkey
+ceph auth add "osd.${1}" osd 'allow *' mon 'allow rwx' -i "/var/lib/ceph/osd/ceph-${1}/keyring"
+ceph osd crush add "${1}" 1 root=default host=cephbox
+ceph-osd -i "${1}" -k "/var/lib/ceph/osd/ceph-${1}/keyring"