diff --git a/drivers/gpu/nvgpu/libnvgpu-drv_safe.export b/drivers/gpu/nvgpu/libnvgpu-drv_safe.export
index 1b2135fdd..58fbccd7b 100644
--- a/drivers/gpu/nvgpu/libnvgpu-drv_safe.export
+++ b/drivers/gpu/nvgpu/libnvgpu-drv_safe.export
@@ -384,6 +384,7 @@ nvgpu_spinlock_acquire
 nvgpu_spinlock_init
 nvgpu_spinlock_release
 nvgpu_sw_quiesce
+nvgpu_sw_quiesce_remove_support
 nvgpu_thread_create
 nvgpu_thread_create_priority
 nvgpu_thread_is_running
diff --git a/userspace/units/init/nvgpu-init.c b/userspace/units/init/nvgpu-init.c
index a55ea6651..71a14c73e 100644
--- a/userspace/units/init/nvgpu-init.c
+++ b/userspace/units/init/nvgpu-init.c
@@ -159,6 +159,9 @@ int test_free_env(struct unit_module *m,
 	nvgpu_posix_io_delete_reg_space(g, mc_boot_0_r());
 	nvgpu_posix_io_delete_reg_space(g, GP10B_FUSE_REG_BASE);
 
+	/* Clean up quiesce thread */
+	nvgpu_sw_quiesce_remove_support(g);
+
 	return UNIT_SUCCESS;
 }