diff --git a/testing/scripts/build-baseimage b/testing/scripts/build-baseimage
index 691cc33e9..1355d7a05 100755
--- a/testing/scripts/build-baseimage
+++ b/testing/scripts/build-baseimage
@@ -15,8 +15,8 @@ INC=build-essential,gperf,libgmp-dev,libldap2-dev,libcurl4-openssl-dev,ethtool
 INC=$INC,libxml2-dev,libtspi-dev,libsqlite3-dev,openssh-server,tcpdump,psmisc
 INC=$INC,openssl,vim,sqlite3,conntrack,gdb,cmake,libxerces-c2-dev,libltdl-dev
 INC=$INC,liblog4cxx10-dev,libboost-thread-dev,libboost-system-dev,git-core
-INC=$INC,less
-SERVICES="isc-dhcp-server apache2 slapd"
+INC=$INC,less,acpid,acpi-support-base
+SERVICES="apache2 dbus isc-dhcp-server slapd"
 INC=$INC,${SERVICES// /,}
 EXC=iptables
 
diff --git a/testing/stop-testing b/testing/stop-testing
index 013637aca..704ae6667 100755
--- a/testing/stop-testing
+++ b/testing/stop-testing
@@ -23,7 +23,7 @@ done
 for host in $STRONGSWANHOSTS
 do
 	log_action "Guest $host"
-	execute "virsh destroy $host"
+	execute "virsh shutdown $host"
 	rm -f $VIRTIMGSTORE/$host.$IMGEXT
 done