diff --git a/tests/chimera-convolve/snitchCluster/simpleITA/CMakeLists.txt b/tests/chimera-convolve/snitchCluster/simpleITA/CMakeLists.txt
index c347115..2ff040e 100644
--- a/tests/chimera-convolve/snitchCluster/simpleITA/CMakeLists.txt
+++ b/tests/chimera-convolve/snitchCluster/simpleITA/CMakeLists.txt
@@ -19,10 +19,8 @@ target_include_directories(${TEST_NAME}_host PUBLIC include)
 target_compile_options(${TEST_NAME}_host
   PRIVATE
   -O2
-  -march=${ISA_HOST}
-  -mabi=${ABI_HOST}
 )
-target_link_libraries(${TEST_NAME}_host PUBLIC chimera-sdk)
+target_link_libraries(${TEST_NAME}_host PUBLIC runtime_host hal_host)
 
 ######## CLUSTER Code ##########################################################
 file(GLOB_RECURSE TEST_SNITCH_SRCS
@@ -37,10 +35,9 @@ target_include_directories(${TEST_NAME}_cluster PUBLIC include)
 target_compile_options(${TEST_NAME}_cluster
   PRIVATE
   -O1
-  -march=${ISA_CLUSTER_SNITCH}
-  -mabi=${ABI_CLUSTER_SNITCH}
 )
-target_link_libraries(${TEST_NAME}_cluster PUBLIC chimera-sdk)
+
+target_link_libraries(${TEST_NAME}_cluster PUBLIC runtime_cluster_snitch)
 
 ######## TEST Executable #######################################################
 add_chimera_test(
diff --git a/tests/chimera-convolve/snitchCluster/simpleITA/include/ita.h b/tests/chimera-convolve/snitchCluster/simpleITA/include/ita.h
index f9bccb0..02c34db 100644
--- a/tests/chimera-convolve/snitchCluster/simpleITA/include/ita.h
+++ b/tests/chimera-convolve/snitchCluster/simpleITA/include/ita.h
@@ -8,7 +8,6 @@
 #define _ITA_INCLUDE_GUARD_
 
 #include "soc.h"
-#include "driver.h"
 #include "cluster_4.h"
 
 #include <stdint.h>