diff --git a/tests/Makefile.am b/tests/Makefile.am
index b32435d2f3..edf7b22c43 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -368,22 +368,22 @@ test_scripts = \
 	secretschematest
 
 libvirtd_test_scripts =		\
-	test_conf.sh			\
-	cpuset				\
-	define-dev-segfault		\
-	int-overflow			\
 	libvirtd-fail			\
 	libvirtd-pool			\
-	read-bufsiz			\
-	read-non-seekable		\
-	start				\
-	virsh-uriprecedence		\
-	vcpupin				\
+	test_conf.sh			\
 	virsh-all			\
+	virsh-cpuset			\
+	virsh-define-dev-segfault	\
+	virsh-int-overflow		\
 	virsh-optparse			\
+	virsh-read-bufsiz		\
+	virsh-read-non-seekable		\
 	virsh-schedinfo			\
+	virsh-start			\
 	virsh-synopsis			\
 	virsh-undefine			\
+	virsh-uriprecedence		\
+	virsh-vcpupin			\
 	$(NULL)
 
 if WITH_LIBVIRTD
diff --git a/tests/cpuset b/tests/virsh-cpuset
similarity index 100%
rename from tests/cpuset
rename to tests/virsh-cpuset
diff --git a/tests/define-dev-segfault b/tests/virsh-define-dev-segfault
similarity index 100%
rename from tests/define-dev-segfault
rename to tests/virsh-define-dev-segfault
diff --git a/tests/int-overflow b/tests/virsh-int-overflow
similarity index 100%
rename from tests/int-overflow
rename to tests/virsh-int-overflow
diff --git a/tests/read-bufsiz b/tests/virsh-read-bufsiz
similarity index 100%
rename from tests/read-bufsiz
rename to tests/virsh-read-bufsiz
diff --git a/tests/read-non-seekable b/tests/virsh-read-non-seekable
similarity index 100%
rename from tests/read-non-seekable
rename to tests/virsh-read-non-seekable
diff --git a/tests/start b/tests/virsh-start
similarity index 100%
rename from tests/start
rename to tests/virsh-start
diff --git a/tests/vcpupin b/tests/virsh-vcpupin
similarity index 100%
rename from tests/vcpupin
rename to tests/virsh-vcpupin