diff --git a/test/grouped_convnd_bwd_data/CMakeLists.txt b/test/grouped_convnd_bwd_data/CMakeLists.txt
index c9462f70c6..3f81297dfe 100644
--- a/test/grouped_convnd_bwd_data/CMakeLists.txt
+++ b/test/grouped_convnd_bwd_data/CMakeLists.txt
@@ -3,33 +3,26 @@
 include(TestUtilities)
 
 # Helper function defined in cmake/TestUtilities.cmake to conditionally link device_conv libraries
-set(DEVICE_INSTANCES "")
-list(APPEND DEVICE_INSTANCES device_grouped_conv2d_bwd_data_nhwgc_instance)
-list(APPEND DEVICE_INSTANCES device_grouped_conv2d_bwd_data_gnhwc_instance)
-list(APPEND DEVICE_INSTANCES device_grouped_conv2d_bwd_data_ngchw_instance)
-list(APPEND DEVICE_INSTANCES device_grouped_conv3d_bwd_data_ndhwgc_instance)
-list(APPEND DEVICE_INSTANCES device_grouped_conv3d_bwd_data_gndhwc_instance)
-list(APPEND DEVICE_INSTANCES device_grouped_conv3d_bwd_data_ngcdhw_instance)
 
 if(GPU_TARGETS MATCHES "gfx9|gfx11|gfx12")
     add_gtest_executable(test_grouped_convnd_bwd_data test_grouped_convnd_bwd_data.cpp)
-    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data PRIVATE utility ${DEVICE_INSTANCES})
+    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data PRIVATE utility device_conv_operations)
 
     add_executable(test_grouped_convnd_bwd_data_large_cases test_grouped_convnd_bwd_data_large_cases.cpp)
     target_compile_options(test_grouped_convnd_bwd_data_large_cases PRIVATE -Wno-global-constructors -Wno-undef)
-    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_large_cases PRIVATE gtest_main getopt::getopt utility ${DEVICE_INSTANCES})
+    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_large_cases PRIVATE gtest_main getopt::getopt utility device_conv_operations)
 
     add_executable(test_grouped_convnd_bwd_data_dataset_xdl test_grouped_convnd_bwd_data_dataset_xdl.cpp)
     target_compile_options(test_grouped_convnd_bwd_data_dataset_xdl PRIVATE -Wno-global-constructors -Wno-undef)
-    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_dataset_xdl PRIVATE gtest_main getopt::getopt utility ${DEVICE_INSTANCES})
+    target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_dataset_xdl PRIVATE gtest_main getopt::getopt utility device_conv_operations)
 
     add_executable(test_grouped_conv_bwd_data_bilinear test_grouped_conv_bwd_data_bilinear.cpp)
     target_compile_options(test_grouped_conv_bwd_data_bilinear PRIVATE -Wno-global-constructors -Wno-undef)
-    target_link_device_conv_libraries_if_exist(test_grouped_conv_bwd_data_bilinear PRIVATE gtest_main getopt::getopt utility ${DEVICE_INSTANCES})
+    target_link_device_conv_libraries_if_exist(test_grouped_conv_bwd_data_bilinear PRIVATE gtest_main getopt::getopt utility device_conv_operations)
 
     add_executable(test_grouped_conv_bwd_data_scale test_grouped_conv_bwd_data_scale.cpp)
     target_compile_options(test_grouped_conv_bwd_data_scale PRIVATE -Wno-global-constructors -Wno-undef)
-    target_link_device_conv_libraries_if_exist(test_grouped_conv_bwd_data_scale PRIVATE gtest_main getopt::getopt utility ${DEVICE_INSTANCES})
+    target_link_device_conv_libraries_if_exist(test_grouped_conv_bwd_data_scale PRIVATE gtest_main getopt::getopt utility device_conv_operations)
 endif()
 
 if(GPU_TARGETS MATCHES "gfx9|gfx1250")
@@ -85,6 +78,6 @@ endif()
 if (CK_USE_XDL OR CK_USE_WMMA) 
     add_gtest_executable(test_grouped_convnd_bwd_data_interface test_grouped_convnd_bwd_data_interface.cpp)
     if(result EQUAL 0)
-        target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_interface PRIVATE utility ${DEVICE_INSTANCES})
+        target_link_device_conv_libraries_if_exist(test_grouped_convnd_bwd_data_interface PRIVATE utility device_conv_operations)
     endif()
 endif()
\ No newline at end of file