diff --git a/userspace/Makefile b/userspace/Makefile
index 0bf1266bf..fc120d5d5 100644
--- a/userspace/Makefile
+++ b/userspace/Makefile
@@ -53,6 +53,8 @@ INCLUDES= 				\
 
 # This Makefile is only for host POSIX builds
 NVGPU_POSIX=1
+# Enable fault injection for unit tests
+NVGPU_FAULT_INJECTION_ENABLEMENT=1
 
 # Linuxy configs. We want these so that we can mirror builds from the actual
 # Linux kernel.
diff --git a/userspace/Makefile.configs b/userspace/Makefile.configs
index cf74699f7..aa5a1814f 100644
--- a/userspace/Makefile.configs
+++ b/userspace/Makefile.configs
@@ -44,7 +44,8 @@ CONFIGS :=				\
         -DCONFIG_GK20A_VIDMEM=1         \
         -DCONFIG_PCI_MSI                \
         -DCONFIG_SUPPORT_PMU_PSTATE	\
-	-DCONFIG_TEGRA_NVLINK
+	-DCONFIG_TEGRA_NVLINK		\
+	-DNVGPU_UNITTEST_FAULT_INJECTION_ENABLEMENT
 
 # Uncomment these to enable the config.
 # CONFIGS += -DCONFIG_NVGPU_TRACK_MEM_USAGE=y