diff --git a/test/TEST-03-JOBS/test-jobs.sh b/test/TEST-03-JOBS/test-jobs.sh
index 4c954d0397..e66ea53621 100755
--- a/test/TEST-03-JOBS/test-jobs.sh
+++ b/test/TEST-03-JOBS/test-jobs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 # Test merging of a --job-mode=ignore-dependencies job into a previously
 # installed job.
diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 88bbf3cdac..08e5cfe6c8 100755
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@@ -3,6 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="Job-related tests"
+TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
@@ -27,6 +28,8 @@ After=multi-user.target
 [Service]
 ExecStart=/test-jobs.sh
 Type=oneshot
+StandardOutput=tty
+StandardError=tty
 EOF
 
         # copy the units used by this test
diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh
index 18856c2459..604ede5b2b 100755
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@@ -11,7 +11,7 @@ TEST_NO_NSPAWN=1
 # selinux-policy-devel
 
 # Check if selinux-policy-devel is installed, and if it isn't bail out early instead of failing
-test -d /usr/share/selinux/devel || exit 0
+test -f /usr/share/selinux/devel/include/system/systemd.if || exit 0
 
 . $TEST_BASE_DIR/test-functions
 SETUP_SELINUX=yes
diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index 4544672066..e7bb5430c0 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -4,6 +4,7 @@
 set -e
 TEST_DESCRIPTION="EXTEND_TIMEOUT_USEC=usec start/runtime/stop tests"
 SKIP_INITRD=yes
+TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
diff --git a/test/test-functions b/test/test-functions
index 6535099047..e69420aeca 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -124,6 +124,7 @@ loglevel=2 \
 init=$ROOTLIBDIR/systemd \
 console=ttyS0 \
 selinux=0 \
+printk.devkmsg=on \
 $_cgroup_args \
 $KERNEL_APPEND \
 "