diff --git a/.github/workflows/conformance-hip.yml b/.github/workflows/conformance-hip.yml
index f1055878a..fd57c6477 100644
--- a/.github/workflows/conformance-hip.yml
+++ b/.github/workflows/conformance-hip.yml
@@ -39,6 +39,8 @@ defaults:
 env:
   ROCM_PATH: /opt/rocm
   LD_LIBRARY_PATH: /opt/rocm/lib
+  LIBVA_DRIVERS_PATH: /opt/rocm/lib/rocm_sysdeps/lib
+  LD_PRELOAD: /opt/rocm/lib/rocm_sysdeps/lib/librocm_sysdeps_va.so.2:/opt/rocm/lib/rocm_sysdeps/lib/librocm_sysdeps_va-drm.so.2
   HIP_VISIBLE_DEVICES: 0
 
 # Cancel superseded runs of the same ref so rapid pushes to a PR don't queue up
diff --git a/tests/cpp_api/CMakeLists.txt b/tests/cpp_api/CMakeLists.txt
index 61237b2b7..bdc6cb8d2 100644
--- a/tests/cpp_api/CMakeLists.txt
+++ b/tests/cpp_api/CMakeLists.txt
@@ -244,11 +244,11 @@ endif()
 if(rocjpeg_FOUND)
   add_test(NAME basic_test_rocjpeg_gray
             COMMAND basic_test 
-            ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet-val.txt 1 1 224 224 0 1 2
+            ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet-val.txt 1 1 224 224 0 1 1
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/basic_test)
   add_test(NAME basic_test_rocjpeg_rgb
             COMMAND basic_test 
-            ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet-val.txt 1 1 224 224 1 1 2
+            ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet ${ROCM_PATH}/share/rocal/test/data/images/AMD-tinyDataSet-val.txt 1 1 224 224 1 1 1
             WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/basic_test)
 endif()