diff --git a/projects/hipblaslt/CMakeLists.txt b/projects/hipblaslt/CMakeLists.txt
index ac54c605c266..529ec2bd6f0e 100644
--- a/projects/hipblaslt/CMakeLists.txt
+++ b/projects/hipblaslt/CMakeLists.txt
@@ -656,8 +656,13 @@ if(HIPBLASLT_INSTALL_TENSILELITE_TEST_ARTIFACTS AND NOT WIN32)
         OPTIONAL
     )
 
-    # TODO: Add C++ test tools (tensilelite-client, cpu-gemm-driver) when
-    # common/generator tests are enabled in CI.
+    if(TENSILELITE_ENABLE_CLIENT)
+        install(
+            TARGETS tensilelite-client
+            RUNTIME DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/hipblaslt/tensilelite"
+            COMPONENT tests
+        )
+    endif()
 endif()
 
 if(HIPBLASLT_ENABLE_CLIENT AND HIPBLASLT_ENABLE_SAMPLES)
diff --git a/projects/hipblaslt/tensilelite/Tensile/Tests/unit/test_MatrixInstructionConversion.py b/projects/hipblaslt/tensilelite/Tensile/Tests/unit/test_MatrixInstructionConversion.py
index d12e286d9569..02a62beed782 100644
--- a/projects/hipblaslt/tensilelite/Tensile/Tests/unit/test_MatrixInstructionConversion.py
+++ b/projects/hipblaslt/tensilelite/Tensile/Tests/unit/test_MatrixInstructionConversion.py
@@ -22,6 +22,7 @@
 #
 # SPDX-License-Identifier: MIT
 ################################################################################
+import pytest
 import yaml
 from pprint import pformat
 
@@ -33,10 +34,14 @@
 from Tensile.SolutionStructs.Validators.MatrixInstruction import matrixInstructionToMIParameters, validateMIParameters
 from Tensile.SolutionStructs.Validators.WorkGroup import validateWorkGroup
 
-cxxCompiler = validateToolchain("amdclang++")
-isaInfoMap = makeIsaInfoMap(SUPPORTED_ISA, cxxCompiler)
 
-def test_convert_9_item_custom_kernel_config():
+@pytest.fixture(scope="module")
+def isa_info_map():
+    cxxCompiler = validateToolchain("amdclang++")
+    return makeIsaInfoMap(SUPPORTED_ISA, cxxCompiler)
+
+
+def test_convert_9_item_custom_kernel_config(isa_info_map):
     input_conf = yaml.load(
 """
 ProblemType:
@@ -76,7 +81,7 @@ def test_convert_9_item_custom_kernel_config():
         wavefrontSize,
         ptype,
         workgroup,
-        isaInfoMap,
+        isa_info_map,
     )
 
     input = {
@@ -108,7 +113,7 @@ def test_convert_9_item_custom_kernel_config():
     solution.update(input_conf)
     solution.update(outputConf)
 
-    assert validateMIParameters(solution, isaInfoMap, True)
+    assert validateMIParameters(solution, isa_info_map, True)
     assert validateWorkGroup(solution)
 
     mi4 = solution["MatrixInstruction"]
@@ -122,7 +127,7 @@ def test_convert_9_item_custom_kernel_config():
     assert format9 == mi
 
 
-def testConvert9ItemCustomKernelConfig():
+def testConvert9ItemCustomKernelConfig(isa_info_map):
 
     inputConf = yaml.load(
 """
@@ -178,7 +183,7 @@ def testConvert9ItemCustomKernelConfig():
         wavefrontSize,
         inputConf["ProblemType"],
         workGroup,
-        isaInfoMap,
+        isa_info_map,
     )
 
     input = {
@@ -210,4 +215,4 @@ def testConvert9ItemCustomKernelConfig():
     solution.update(inputConf)
     solution.update(outputConf)
 
-    assert validateMIParameters(solution, isaInfoMap, True) == True
+    assert validateMIParameters(solution, isa_info_map, True) == True