diff --git a/qa/qa-sample.yaml b/qa/qa-sample.yaml
index 3901d962ba7256b9cc5714938de22cafaa4128c4..a5795d705e6ee1071aa3f2e8d2063ef0625513ce 100644
--- a/qa/qa-sample.yaml
+++ b/qa/qa-sample.yaml
@@ -1,8 +1,9 @@
 # Cluster name
 name: xen-test
+hypervisor-type: xen-3.0
 
 # System to use
-os: debian-edgy
+os: debian-etch
 os-size: 10G
 swap-size: 1G
 mem: 512M
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 245ac681b00f79d1bc92555c328885e9f3eeab8e..08868fd5eb6ad85dfed2133c7641bfef34f70194 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -66,6 +66,10 @@ def TestClusterInit():
     cmd.append('--bridge=%s' % bridge)
     cmd.append('--master-netdev=%s' % bridge)
 
+  htype = qa_config.get('hypervisor-type', None)
+  if htype:
+    cmd.append('--hypervisor-type=%s' % htype)
+
   cmd.append(qa_config.get('name'))
 
   AssertEqual(StartSSH(master['primary'],