diff --git a/debian/tests/control b/debian/tests/control
index 52fa705..83c818f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,11 @@
-Tests: install sysvinit-install daemon testsuite
+Tests: install sysvinit-install
+Restrictions: needs-root isolation-machine breaks-testbed
+Depends:
+
+Tests: daemon
+Restrictions: needs-root isolation-machine
+Depends: open-iscsi, python
+
+Tests: testsuite
 Restrictions: needs-root isolation-machine breaks-testbed
 Depends: open-iscsi, python, tgt, qemu-system, ubuntu-cloudimage-keyring, simplestreams, distro-info, cloud-image-utils
diff --git a/debian/tests/test-open-iscsi.py b/debian/tests/test-open-iscsi.py
index 43297ca..8c93032 100644
--- a/debian/tests/test-open-iscsi.py
+++ b/debian/tests/test-open-iscsi.py
@@ -228,6 +228,8 @@ class MAASEphemeralTest(testlib.TestlibCase, PrivateOpenIscsiTest):
         # Add self.here to PATH so xkvm will be available to tgt-boot-test
         env['PATH'] = env['PATH'] + ":%s" % self.here
         env['OUTPUT_DISK'] = self.output_disk_path
+        # make output go to console rather than serial.log file
+        env['NO_LOG'] = "1"
         rel_dir = '{}.d'.format(self.release)
         subprocess.call([
             tgt_boot_cmd,
@@ -236,9 +238,12 @@ class MAASEphemeralTest(testlib.TestlibCase, PrivateOpenIscsiTest):
             os.path.join(self.here, rel_dir, self.subarch, 'boot-initrd')],
             env=env)
         files = self.extract_files(self.output_disk_path)
+        resolvconf_contents = None
         for f in files:
             if f.endswith('resolv.conf'):
                 resolvconf_contents = open(f).read()
+        if resolvconf_contents is None:
+            raise Exception("no resolv.conf file in files: %s" % files)
         self.assertIn(
             '10.0.12.3', resolvconf_contents,
             msg="10.0.12.3 not in resolvconf contents: \n{}".format(