diff --git a/Makefile b/Makefile
index 45d8554ce..281c78dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -81,8 +81,10 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de
 
 # Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
 ifeq ($(shell whoami 2>/dev/null),root)
-    ifeq ($(filter install all_clean,$(MAKECMDGOALS)),)
-        $(error You should not be running this as root)
+    ifeq ($(filter install,$(MAKECMDGOALS)),)
+        ifndef FAKEROOTKEY
+            $(error You should not be running this as root)
+        endif
     endif
 endif
 
diff --git a/package/linux/debian/rules b/package/linux/debian/rules
index b67ae85e6..266ce3487 100644
--- a/package/linux/debian/rules
+++ b/package/linux/debian/rules
@@ -18,8 +18,5 @@ override_dh_auto_clean:
 override_dh_auto_build:
 	#dh_auto_build -- all
 
-override_dh_auto_test:
-	# Fails non-silently because it is run under fakeroot.
-
 override_dh_auto_install:
 	dh_auto_install -- prefix=/usr