diff --git a/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b.h b/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b.h
index 506b9f52b..7e9b8a1c4 100644
--- a/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b.h
+++ b/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b.h
@@ -37,7 +37,6 @@ bool gv11b_pmu_is_engine_in_reset(struct gk20a *g);
 void gv11b_pmu_engine_reset(struct gk20a *g, bool do_reset);
 u32 gv11b_pmu_falcon_base_addr(void);
 bool gv11b_is_pmu_supported(struct gk20a *g);
-int gv11b_pmu_correct_ecc(struct gk20a *g, u32 ecc_status, u32 ecc_addr);
 void gv11b_pmu_handle_ext_irq(struct gk20a *g, u32 intr0);
 
 #ifdef CONFIG_NVGPU_LS_PMU
diff --git a/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b_fusa.c b/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b_fusa.c
index 8008e8658..9a477c246 100644
--- a/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b_fusa.c
+++ b/drivers/gpu/nvgpu/hal/pmu/pmu_gv11b_fusa.c
@@ -134,7 +134,7 @@ int gv11b_pmu_bar0_error_status(struct gk20a *g, u32 *bar0_status,
 	return (-EIO);
 }
 
-int gv11b_pmu_correct_ecc(struct gk20a *g, u32 ecc_status, u32 ecc_addr)
+static int gv11b_pmu_correct_ecc(struct gk20a *g, u32 ecc_status, u32 ecc_addr)
 {
 	int ret = 0;
 
diff --git a/userspace/SWUTS.sources b/userspace/SWUTS.sources
index ea7ab0d57..d15c359ba 100644
--- a/userspace/SWUTS.sources
+++ b/userspace/SWUTS.sources
@@ -122,5 +122,5 @@ INPUT += ../../../userspace/units/gr/ctx/nvgpu-gr-ctx.h
 INPUT += ../../../userspace/units/gr/obj_ctx/nvgpu-gr-obj-ctx.h
 INPUT += ../../../userspace/units/gr/config/nvgpu-gr-config.h
 INPUT += ../../../userspace/units/ecc/nvgpu-ecc.h
-INPUT += ../../../userspace/units/ecc/nvgpu-pmu.h
+INPUT += ../../../userspace/units/pmu/nvgpu-pmu.h
 INPUT += ../../../userspace/units/io/common_io.h
diff --git a/userspace/units/acr/nvgpu-acr.h b/userspace/units/acr/nvgpu-acr.h
index 2131ac75e..993c75b45 100644
--- a/userspace/units/acr/nvgpu-acr.h
+++ b/userspace/units/acr/nvgpu-acr.h
@@ -119,7 +119,7 @@ int test_acr_is_lsf_lazy_bootstrap(struct unit_module *m, struct gk20a *g,
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: g->ops.acr.acr_construct_execute
+ * Targets: nvgpu_acr_construct_execute
  *
  * Input: None
  *
@@ -149,7 +149,12 @@ int test_acr_construct_execute(struct unit_module *m,
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: nvgpu_acr_bootstrap_hs_acr
+ * Targets: nvgpu_acr_bootstrap_hs_acr, nvgpu_pmu_report_bar0_pri_err_status,
+ *	gops_pmu.validate_mem_integrity, gv11b_pmu_validate_mem_integrity,
+ *	gops_pmu.is_debug_mode_enabled, gv11b_pmu_is_debug_mode_en,
+ *	gops_acr.pmu_clear_bar0_host_err_status,
+ *	gv11b_clear_pmu_bar0_host_err_status, gops_pmu.bar0_error_status,
+ *	gv11b_pmu_bar0_error_status
  *
  * Input: None
  *
diff --git a/userspace/units/falcon/falcon_tests/nvgpu-falcon.h b/userspace/units/falcon/falcon_tests/nvgpu-falcon.h
index bdff31731..fd7ad1647 100644
--- a/userspace/units/falcon/falcon_tests/nvgpu-falcon.h
+++ b/userspace/units/falcon/falcon_tests/nvgpu-falcon.h
@@ -38,7 +38,10 @@ struct unit_module;
  * Test Type: Feature, Error guessing
  *
  * Targets: nvgpu_falcon_get_instance, nvgpu_falcon_sw_init,
- *	    nvgpu_falcon_sw_free
+ *	    nvgpu_falcon_sw_free, gops_pmu.falcon_base_addr,
+ *	    gv11b_pmu_falcon_base_addr, gops_pmu.setup_apertures,
+ *	    gv11b_setup_apertures, gops_pmu.flcn_setup_boot_config,
+ *	    gv11b_pmu_flcn_setup_boot_config
  *
  * Input: None.
  *
diff --git a/userspace/units/pmu/nvgpu-pmu.h b/userspace/units/pmu/nvgpu-pmu.h
index 717413641..4fc7bc5e7 100644
--- a/userspace/units/pmu/nvgpu-pmu.h
+++ b/userspace/units/pmu/nvgpu-pmu.h
@@ -37,7 +37,8 @@ struct unit_module;
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: nvgpu_pmu_early_init
+ * Targets: gops_pmu.pmu_early_init, nvgpu_pmu_early_init, gops_pmu.ecc_init,
+ * 	gv11b_pmu_ecc_init, gops_pmu.ecc_free, gv11b_pmu_ecc_free
  *
  * Input: None
  *
@@ -65,7 +66,7 @@ int test_pmu_early_init(struct unit_module *m, struct gk20a *g, void *args);
  *
  * Test Type: Error guessing
  *
- * Targets: g->ops.pmu.is_pmu_supported
+ * Targets: gops_pmu.is_pmu_supported, gv11b_is_pmu_supported
  *
  * Input: None
  * Steps:
@@ -110,7 +111,11 @@ int test_pmu_remove_support(struct unit_module *m, struct gk20a *g,
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: nvgpu_pmu_reset
+ * Targets: nvgpu_pmu_enable_irq, nvgpu_pmu_reset, gops_pmu.pmu_enable_irq,
+ *		gv11b_pmu_enable_irq,
+ *		gops_pmu.get_irqdest, gv11b_pmu_get_irqdest,
+ *		gops_pmu.reset_engine, gv11b_pmu_engine_reset,
+ *		gops_pmu.is_engine_in_reset, gv11b_pmu_is_engine_in_reset
  *
  * Input: None
  *
@@ -142,7 +147,8 @@ int test_pmu_reset(struct unit_module *m, struct gk20a *g,
  *
  * Test Type: Feature, Error guessing
  *
- * Targets: g->ops.pmu.pmu_isr
+ * Targets: gops_pmu.pmu_isr, gk20a_pmu_isr,
+		gops_pmu.handle_ext_irq, gv11b_pmu_handle_ext_irq
  *
  * Input: None
  *