diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index cfb39bab1..cdaedf3e4 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -41,6 +41,7 @@ EXTRA_DIST = \
 	expected-coreos.img.xml \
 	expected-windows.img.xml \
 	test-virt-inspector.sh \
+	test-virt-inspector-docs.sh \
 	test-xmllint.sh.in \
 	virt-inspector.pod
 
@@ -107,7 +108,14 @@ stamp-virt-inspector.pod: virt-inspector.pod
 	touch $@
 
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
-TESTS = test-virt-inspector.sh
+
+TESTS = \
+	test-virt-inspector-docs.sh
+
+if ENABLE_APPLIANCE
+TESTS += \
+	test-virt-inspector.sh
+endif ENABLE_APPLIANCE
 if HAVE_XMLLINT
 TESTS += test-xmllint.sh
 endif
diff --git a/inspector/test-virt-inspector-docs.sh b/inspector/test-virt-inspector-docs.sh
new file mode 100755
index 000000000..8cd19abe1
--- /dev/null
+++ b/inspector/test-virt-inspector-docs.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -
+# libguestfs
+# Copyright (C) 2016 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+export LANG=C
+set -e
+
+$srcdir/../podcheck.pl virt-inspector.pod virt-inspector
diff --git a/inspector/virt-inspector.pod b/inspector/virt-inspector.pod
index 2347272c4..102ba2eb8 100644
--- a/inspector/virt-inspector.pod
+++ b/inspector/virt-inspector.pod
@@ -74,9 +74,9 @@ force a particular format use the I<--format=..> option.
 
 Add a remote disk.  See L<guestfish(1)/ADDING REMOTE STORAGE>.
 
-=item B<-c URI>
+=item B<-c> URI
 
-=item B<--connect URI>
+=item B<--connect> URI
 
 If using libvirt, connect to the given I<URI>.  If omitted,
 then we connect to the default libvirt hypervisor.
diff --git a/p2v/Makefile.am b/p2v/Makefile.am
index 8136b90b1..d1dcc3458 100644
--- a/p2v/Makefile.am
+++ b/p2v/Makefile.am
@@ -26,6 +26,7 @@ EXTRA_DIST = \
 	launch-virt-p2v.in \
 	p2v.ks.in \
 	p2v.service \
+	test-virt-p2v-docs.sh \
 	test-virt-p2v-pxe.sshd_config.in \
 	test-virt-p2v-scp.sh \
 	test-virt-p2v-ssh.sh \
@@ -238,7 +239,8 @@ virt-p2v.img: \
 TESTS_ENVIRONMENT = $(top_builddir)/run --test
 
 TESTS = \
-	test-virt-p2v-cmdline.sh
+	test-virt-p2v-cmdline.sh \
+	test-virt-p2v-docs.sh
 
 if ENABLE_APPLIANCE
 TESTS += \
diff --git a/p2v/test-virt-p2v-docs.sh b/p2v/test-virt-p2v-docs.sh
new file mode 100755
index 000000000..c2d35853d
--- /dev/null
+++ b/p2v/test-virt-p2v-docs.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -
+# libguestfs
+# Copyright (C) 2016 Red Hat Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+export LANG=C
+set -e
+
+$srcdir/../podcheck.pl virt-p2v.pod virt-p2v