diff -r f5321161c649 tools/xm-test/lib/XmTestLib/acm.py
--- a/tools/xm-test/lib/XmTestLib/acm.py	Thu Oct 19 14:53:12 2006
+++ b/tools/xm-test/lib/XmTestLib/acm.py	Thu Oct 19 17:04:16 2006
@@ -26,7 +26,7 @@
     ACM_LABEL_RESOURCES = False
 
 labeled_resources = {}
-acm_verbose = True
+acm_verbose = False
 
 def isACMEnabled():
     return security.on()
diff -r f5321161c649 tools/xm-test/runtest.sh
--- a/tools/xm-test/runtest.sh	Thu Oct 19 14:53:12 2006
+++ b/tools/xm-test/runtest.sh	Thu Oct 19 17:04:16 2006
@@ -197,7 +197,10 @@
 unsafe=no
 GROUPENTERED=default
 
-cp -f tests/security-acm/xm-test-security_policy.xml /etc/xen/acm-security/policies
+if [ -d /etc/xen/acm-security/policies ]; then
+	cp -f tests/security-acm/xm-test-security_policy.xml \
+	      /etc/xen/acm-security/policies
+fi
 
 # Resolve options
 while [ $# -gt 0 ]