diff --git a/catch/unit/vulkan_interop/CMakeLists.txt b/catch/unit/vulkan_interop/CMakeLists.txt
index 4803737598..f9da0ac406 100644
--- a/catch/unit/vulkan_interop/CMakeLists.txt
+++ b/catch/unit/vulkan_interop/CMakeLists.txt
@@ -1,5 +1,6 @@
+set(COMMON_SHARED_SRC vulkan_test.cc)
+
 set(TEST_SRC
-    vulkan_test.cc
     hipExternalMemoryGetMappedBuffer.cc
     hipImportExternalMemory.cc
     hipDestroyExternalMemory.cc
@@ -17,16 +18,19 @@ if(NOT Vulkan_FOUND)
     message(STATUS "FOUND VULKAN SDK: $ENV{VULKAN_SDK}")
     set(VULKAN_PATH  $ENV{VULKAN_SDK})
   else()
-    message("Error: Unable to locate Vulkan SDK. please specify VULKAN_PATH")
+    message(STATUS "Vulkan sdk not found, interop test not enabled. Please add VULKAN_PATH to enable the test")
     return()
   endif()
 endif()
 
+if(WIN32)
+  set(LINKER_LIBS vulkan-1)
+else()
+  set(LINKER_LIBS vulkan)
+endif()
+
 hip_add_exe_to_target(NAME VulkanInteropTest
                       TEST_SRC ${TEST_SRC}
-                      TEST_TARGET_NAME build_tests)
-if (WIN32)
-  target_link_libraries(VulkanInteropTest vulkan-1)
-else (WIN32)
-  target_link_libraries(VulkanInteropTest vulkan)
-endif (WIN32)
\ No newline at end of file
+                      TEST_TARGET_NAME build_tests
+                      COMMON_SHARED_SRC ${COMMON_SHARED_SRC}
+                      LINKER_LIBS ${LINKER_LIBS})