1 files changed, 9 insertions, 10 deletions
diff --git a/test/test-functions b/test/test-functions
index 84ce1e9475..5fdf0a18bd 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -574,22 +574,21 @@ inst_libdir_file() {
     fi
 }
 
+check_qemu() {
+    command -v qemu-kvm &>/dev/null && [[ -c /dev/kvm ]]
+}
+
+check_nspawn() {
+    [[ -d /sys/fs/cgroup/systemd ]]
+}
+
+
 do_test() {
     if [[ $UID != "0" ]]; then
         echo "TEST: $TEST_DESCRIPTION [SKIPPED]: not root" >&2
         exit 0
     fi
 
-    if ! command -v qemu-kvm &>/dev/null; then
-        echo "TEST: $TEST_DESCRIPTION [SKIPPED]: no qemu-kvm found" >&2
-        exit 0
-    fi
-
-    if ! [[ -c /dev/kvm ]]; then
-        echo "TEST: $TEST_DESCRIPTION [SKIPPED]: /dev/kvm not found" >&2
-        exit 0
-    fi
-
 # Detect lib paths
     [[ $libdir ]] || for libdir in /lib64 /lib; do
         [[ -d $libdir ]] && libdirs+=" $libdir" && break