diff --git a/drivers/tegra/hwpm/Makefile b/drivers/tegra/hwpm/Makefile
index e212091..04b50c4 100644
--- a/drivers/tegra/hwpm/Makefile
+++ b/drivers/tegra/hwpm/Makefile
@@ -43,7 +43,7 @@ ccflags-y += -DCONFIG_TEGRA_HWPM_OOT
 CONFIG_TEGRA_FUSE_UPSTREAM := y
 ccflags-y += -DCONFIG_TEGRA_FUSE_UPSTREAM
 
-ifneq ($(NV_BUILD_SYSTEM_TYPE),)
+ifneq ($(srctree.nvconftest),)
 ccflags-y += -DCONFIG_TEGRA_HWPM_CONFTEST
 ccflags-y += -I$(srctree.nvconftest)
 endif
diff --git a/drivers/tegra/hwpm/os/linux/driver.c b/drivers/tegra/hwpm/os/linux/driver.c
index c51a238..b6547b8 100644
--- a/drivers/tegra/hwpm/os/linux/driver.c
+++ b/drivers/tegra/hwpm/os/linux/driver.c
@@ -10,7 +10,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  */
-#if defined(CONFIG_TEGRA_HWPM_CONFTEST) && defined(CONFIG_TEGRA_HWPM_OOT)
+#if defined(CONFIG_TEGRA_HWPM_CONFTEST)
 #include <nvidia/conftest.h>
 #endif
 
diff --git a/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.c b/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.c
index 670d638..408e6d7 100644
--- a/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.c
+++ b/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2021-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
-#if defined(CONFIG_TEGRA_HWPM_CONFTEST) && defined(CONFIG_TEGRA_HWPM_OOT)
+#if defined(CONFIG_TEGRA_HWPM_CONFTEST)
 #include <nvidia/conftest.h>
 #endif
 #include <linux/mm.h>
diff --git a/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.h b/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.h
index 8bed0f7..69625f7 100644
--- a/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.h
+++ b/drivers/tegra/hwpm/os/linux/mem_mgmt_utils.h
@@ -17,7 +17,7 @@
 #ifndef TEGRA_HWPM_OS_LINUX_MEM_MGMT_UTILS_H
 #define TEGRA_HWPM_OS_LINUX_MEM_MGMT_UTILS_H
 
-#if defined(CONFIG_TEGRA_HWPM_CONFTEST) && defined(CONFIG_TEGRA_HWPM_OOT)
+#if defined(CONFIG_TEGRA_HWPM_CONFTEST)
 #include <nvidia/conftest.h>
 #endif