diff --git a/drivers/gpu/nvgpu/Makefile.shared.configs b/drivers/gpu/nvgpu/Makefile.shared.configs
index b038ca7b1..f7b276d07 100644
--- a/drivers/gpu/nvgpu/Makefile.shared.configs
+++ b/drivers/gpu/nvgpu/Makefile.shared.configs
@@ -191,16 +191,6 @@ endif
 CONFIG_NVGPU_FALCON_DEBUG       := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FALCON_DEBUG
 
-# Enable FSI Error injection support on safety debug and regular build
-# when the HSI error injection utility and NVGPU's MISC_EC support is
-# enabled.
-ifeq ($(CONFIG_TEGRA_HSIERRRPTINJ),1)
-ifeq ($(CONFIG_NVGPU_ENABLE_MISC_EC),1)
-CONFIG_NVGPU_FSI_ERR_INJECTION    := 1
-NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FSI_ERR_INJECTION
-endif
-endif
-
 #
 # Flags enabled only for regular build profile.
 #
@@ -211,6 +201,21 @@ CONFIG_NVGPU_SYSFS              := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_SYSFS
 endif
 
+# Enable FSI Error injection support only on regular build when the
+# build configuartion is VLTest. The safety build will use
+# Mon process, so error injection on safety build is part of Mon
+# Makefile.
+# Also, enable this HSI error injection when NVGPU's MISC_EC support
+# is enabled and Server support is not present.
+ifeq ($(NV_BUILD_CONFIGURATION_IS_VLTEST),1)
+ifeq ($(CONFIG_NVGPU_ENABLE_MISC_EC),1)
+ifneq ($(NVGPU_HVRTOS),1)
+CONFIG_NVGPU_FSI_ERR_INJECTION    := 1
+NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_FSI_ERR_INJECTION
+endif
+endif
+endif
+
 # ACR feature to enable old tegra ACR profile support
 CONFIG_NVGPU_ACR_LEGACY         := 1
 NVGPU_COMMON_CFLAGS             += -DCONFIG_NVGPU_ACR_LEGACY