diff --git a/ChangeLog b/ChangeLog
index 73702a53d7..6c37ac48a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Apr  7 14:36:56 CET 2008 Jim Meyering <meyering@redhat.com>
+
+	* tests/vcpupin: Add a test for the 2008-04-04 virsh.c bugfix.
+
 Mon Apr  7 12:53:01 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
 	* docs/bugs.html docs/libvir.html: update the page bugzilla URIs
diff --git a/tests/vcpupin b/tests/vcpupin
index b56c7f266a..7b5f86cf96 100755
--- a/tests/vcpupin
+++ b/tests/vcpupin
@@ -24,14 +24,23 @@ fi
 . $srcdir/test-lib.sh
 
 fail=0
+
+# Invalid syntax.
 virsh --connect test:///default vcpupin test a 0,1 > out 2>&1
 test $? = 1 || fail=1
-
 cat <<\EOF > exp || fail=1
 error: vcpupin: Invalid or missing vCPU number.
 
 EOF
+compare out exp || fail=1
 
+# An out-of-range vCPU number deserves a diagnostic, too.
+virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1
+test $? = 1 || fail=1
+cat <<\EOF > exp || fail=1
+error: vcpupin: Invalid vCPU number.
+
+EOF
 compare out exp || fail=1
 
 (exit $fail); exit $fail