diff --git a/test/Makefile b/test/Makefile
index 0b33660bab..dfaa4509ea 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 .PHONY: all check clean $(wildcard TEST-??-*)
 
 $(wildcard TEST-??-*):
-	@[ "$$EUID" == "0" ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
+	@[ "$(shell id -u)" = 0 ] || { echo "'check' must be run as root! Please use 'sudo'."; exit 1; }
 	@{ \
 		[ -d $@ ] || exit 0; \
 		[ -f $@/Makefile ] || exit 0; \
diff --git a/test/container/Dockerfile-Debian b/test/container/Dockerfile-Debian
index 70cde41247..b4c1704edc 100644
--- a/test/container/Dockerfile-Debian
+++ b/test/container/Dockerfile-Debian
@@ -25,11 +25,15 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     docbook \
     docbook-xml \
     docbook-xsl \
+    fdisk \
     g++ \
     git \
+    iputils-ping \
     isc-dhcp-client \
     kmod \
+    less \
     libkmod-dev \
+    linux-image-generic \
     lvm2 \
     make \
     mdadm \
@@ -40,7 +44,8 @@ RUN apt-get update -y -qq && apt-get upgrade -y -qq && DEBIAN_FRONTEND=nonintera
     open-iscsi \
     pigz \
     pkg-config \
-    qemu \
+    procps \
+    qemu-system-x86 \
     quilt \
     shellcheck \
     squashfs-tools \