diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4a1e0f3dcc..b4fbcc4b6c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -361,7 +361,6 @@ libvirtd_test_scripts =		\
 	libvirtd-fail			\
 	libvirtd-pool			\
 	virconftest.sh			\
-	virsh-all			\
 	virsh-cpuset			\
 	virsh-define-dev-segfault	\
 	virsh-int-overflow		\
diff --git a/tests/virsh-all b/tests/virsh-all
deleted file mode 100755
index 4a91e4e102..0000000000
--- a/tests/virsh-all
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# blindly run each and every command listed by "virsh help"
-
-# Copyright (C) 2008, 2009 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, see
-# <http://www.gnu.org/licenses/>.
-
-. "$(dirname $0)/test-lib.sh"
-
-test_expensive
-
-fail=0
-
-test_url=test:///default
-
-$abs_top_builddir/tools/virsh -c $test_url help | grep -v connect > cmds || framework_failure
-cmds=$(sed -n 's/^    \([^ ][^ ]*\) .*/\1/p' cmds) || framework_failure
-test -n "$cmds" || framework_failure
-
-test_intro "virsh-all"
-
-counter=0
-for i in $cmds; do
-    counter=`eval "expr $counter + 1"`
-
-    # For now, just run the command and ignore output
-    $abs_top_builddir/tools/virsh -c $test_url $i < /dev/null > /dev/null 2>&1
-    # Temporarily ignoring exit status
-    #status=$?
-    status=0
-    test_result $counter $i $status
-
-    if test "$status" = "1" ; then
-       fail=1
-    fi
-done
-
-test_final $counter $fail
-
-(exit $fail); exit $fail