diff --git a/Makefile.am b/Makefile.am
index 5170ec8c1..388cdeb83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -85,7 +85,7 @@ if HAVE_FUSE
 SUBDIRS += fuse
 endif
 
-# virt-tools in shell.  This uses guestmount.
+# virt-tools in shell.  This uses guestmount and virt-inspector.
 if HAVE_FUSE
 SUBDIRS += clone
 endif
diff --git a/clone/test-virt-sysprep.sh b/clone/test-virt-sysprep.sh
index 897afb709..632d366e4 100755
--- a/clone/test-virt-sysprep.sh
+++ b/clone/test-virt-sysprep.sh
@@ -23,13 +23,22 @@ rm -f test.img guestfish
 
 qemu-img create -f qcow2 -o backing_file=../images/fedora.img test.img
 
-cat <<'EOF' > guestfish
+# Provide alternate 'virt-inspector' and 'guestmount' binaries
+# that run the just-built programs.
+
+cat <<'EOF' > virt-inspector
 #!/bin/sh -
-../run ../fish/guestfish "$@"
+../run ../inspector/virt-inspector "$@"
 EOF
-chmod +x guestfish
+chmod +x virt-inspector
+cat <<'EOF' > guestmount
+#!/bin/sh -
+../run ../fuse/guestmount "$@"
+EOF
+chmod +x guestmount
+
 PATH=.:$PATH
 
 ./virt-sysprep -a test.img
 
-rm -f test.img guestfish
+rm -f test.img virt-inspector guestmount