Index: root/xen-unstable.hg/tools/xm-test/runtest.sh
===================================================================
--- root.orig/xen-unstable.hg/tools/xm-test/runtest.sh
+++ root/xen-unstable.hg/tools/xm-test/runtest.sh
@@ -16,6 +16,7 @@ usage() {
     echo "  -r <url>    : url of test results repository to use"
     echo "  -s <report> : just submit report <report>"
     echo "  -u          : unsafe -- do not run the sanity checks before starting"
+    echo "  -md         : all created domains are xend-'managed' domains"
     echo "  -h | --help : show this help"
 }
 
@@ -218,11 +219,14 @@ run=yes
 unsafe=no
 GROUPENTERED=default
 
+#Prepare for usage with ACM
 if [ -d /etc/xen/acm-security/policies ]; then
 	cp -f tests/security-acm/xm-test-security_policy.xml \
 	      /etc/xen/acm-security/policies
 fi
 
+unset XM_MANAGED_DOMAINS
+
 # Resolve options
 while [ $# -gt 0 ]
   do
@@ -260,6 +264,10 @@ while [ $# -gt 0 ]
 	  unsafe=yes
 	  report=no
 	  ;;
+      -md)
+          echo "(use managed domains)"
+          export XM_MANAGED_DOMAINS=1
+          ;;
       -h|--help)
           usage
           exit 0
Index: root/xen-unstable.hg/tools/xm-test/lib/XmTestLib/Xm.py
===================================================================
--- root.orig/xen-unstable.hg/tools/xm-test/lib/XmTestLib/Xm.py
+++ root/xen-unstable.hg/tools/xm-test/lib/XmTestLib/Xm.py
@@ -49,6 +49,8 @@ def domid(name):
 
     if status != 0 or "Traceback" in output:
         return -1
+    if output == "None":
+        return -1
     try:
         return int(output)
     except: