diff --git a/ChangeLog b/ChangeLog
index d209ba1e1c..2828d4309e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 Mon Nov 24 08:10:49 +0100 2008 Jim Meyering <meyering@redhat.com>
 
+	tests: virsh-all: new script
+	* tests/virsh-all: New script.
+	* tests/Makefile.am (test_scripts): Add virsh-all.
+
 	Move the expected output data from virshdata/*.txt into virshtest.c.
 	* tests/virshtest.c: Embed literal, expected output here, rather than
 	using virshdata/*.txt file names.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5a70c4de38..f20dde22ca 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -62,6 +62,7 @@ test_scripts += \
 	read-non-seekable \
 	undefine \
 	vcpupin
+	virsh-all
 endif
 
 EXTRA_DIST += $(test_scripts)
diff --git a/tests/virsh-all b/tests/virsh-all
new file mode 100755
index 0000000000..9f92adbeab
--- /dev/null
+++ b/tests/virsh-all
@@ -0,0 +1,40 @@
+#!/bin/sh
+# blindly run each and every command listed by "virsh help"
+
+# Copyright (C) 2008 Free Software Foundation, 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 3 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, see <http://www.gnu.org/licenses/>.
+
+if test "$VERBOSE" = yes; then
+  set -x
+  virsh --version
+fi
+
+test -z "$srcdir" && srcdir=$(pwd)
+. "$srcdir/test-lib.sh"
+
+fail=0
+
+test_url=test:///default
+
+virsh -c $test_url help > cmds || framework_failure
+cmds=$(sed -n 's/^    \([^ ][^ ]*\) .*/\1/p' cmds) || framework_failure
+test -n "$cmds" || framework_failure
+
+for i in $cmds; do
+    echo testing $i... 1>&2
+    virsh -c $test_url $i < /dev/null
+done
+
+(exit $fail); exit $fail