diff --git a/cmake/riscv_iree_gcc.cmake b/cmake/riscv_iree_gcc.cmake
index 39716ea..28c8851 100644
--- a/cmake/riscv_iree_gcc.cmake
+++ b/cmake/riscv_iree_gcc.cmake
@@ -54,7 +54,7 @@
 )
 
 # TODO(lundong): Move no_warning_flags to IREE code base
-set(C_NO_WARNING_FLAGS "-Wno-char-subscripts -Wno-format -Wno-incompatible-pointer-types -Wno-int-to-pointer-cast -Wstrict-aliasing=0 -Wno-pointer-to-int-cast")
+set(C_NO_WARNING_FLAGS "-Wno-char-subscripts -Wno-format -Wno-incompatible-pointer-types -Wno-int-to-pointer-cast -Wno-pointer-to-int-cast")
 
 set(CMAKE_C_FLAGS             "${RISCV_COMPILER_FLAGS} ${CMAKE_C_FLAGS} ${C_NO_WARNING_FLAGS}")
 set(CMAKE_CXX_FLAGS           "${RISCV_COMPILER_FLAGS} ${RISCV_COMPILER_FLAGS_CXX} ${CMAKE_CXX_FLAGS}")
diff --git a/risp4ml/isp_stages/CMakeLists.txt b/risp4ml/isp_stages/CMakeLists.txt
index 080dad2..ac2023b 100644
--- a/risp4ml/isp_stages/CMakeLists.txt
+++ b/risp4ml/isp_stages/CMakeLists.txt
@@ -128,6 +128,25 @@
 
 sparrow_test(
   NAME
+    wbg_test
+  SRCS
+    "wbg_test.cc"
+  DEPS
+    ::wbg
+    pw_unit_test
+    pw_unit_test.main
+    pw_assert_basic
+  TESTFILES
+    "wbg_test.run"
+)
+
+# Do not compile the following tests for Kelvin
+if (${BUILD_WITH_KELVIN})
+  return()
+endif()
+
+sparrow_test(
+  NAME
     downscale_test
   SRCS
     ${DOWNSCALE_TEST_SRC}
@@ -153,17 +172,3 @@
   TESTFILES
     "gamma_test.run"
 )
-
-sparrow_test(
-  NAME
-    wbg_test
-  SRCS
-    "wbg_test.cc"
-  DEPS
-    ::wbg
-    pw_unit_test
-    pw_unit_test.main
-    pw_assert_basic
-  TESTFILES
-    "wbg_test.run"
-)
diff --git a/samples/microbenchmarks/CMakeLists.txt b/samples/microbenchmarks/CMakeLists.txt
index e28f5b0..afa8aa5 100644
--- a/samples/microbenchmarks/CMakeLists.txt
+++ b/samples/microbenchmarks/CMakeLists.txt
@@ -27,20 +27,6 @@
   VMVX
 )
 
-iree_cc_binary(
-  NAME
-    conv1x1_test_emitc_vmvx
-  SRCS
-    "conv1x1_test.c"
-  DEPS
-    ::conv1x1_test_vmvx_emitc
-    model_util::util_vmvx
-  LINKOPTS
-    "LINKER:--defsym=__stack_size__=64k"
-  COPTS
-    "-DBUILD_VMVX"
-)
-
 sparrow_test(
   NAME
     conv1x1_test_emitc_static
@@ -55,3 +41,24 @@
   TESTFILES
     "conv1x1_test.run"
 )
+
+# Do not compile following models for Kelvin
+if (${BUILD_WITH_KELVIN})
+  return()
+endif()
+
+sparrow_test(
+  NAME
+    conv1x1_test_emitc_vmvx
+  SRCS
+    "conv1x1_test.c"
+  DEPS
+    ::conv1x1_test_vmvx_emitc
+    model_util::util_vmvx
+  LINKOPTS
+    "LINKER:--defsym=__stack_size__=64k"
+  COPTS
+    "-DBUILD_VMVX"
+  TESTFILES
+    "conv1x1_vmvx_test.run"
+)
diff --git a/samples/microbenchmarks/conv1x1_test.run b/samples/microbenchmarks/conv1x1_test.run
index cc653cf..2aa9a92 100644
--- a/samples/microbenchmarks/conv1x1_test.run
+++ b/samples/microbenchmarks/conv1x1_test.run
@@ -1,2 +1 @@
 // RUN: ${TEST_RUNNER_CMD} %S/conv1x1_test_emitc_static
-// RUN: ${TEST_RUNNER_CMD} %S/conv1x1_test_emitc_vmvx
diff --git a/samples/microbenchmarks/conv1x1_vmvx_test.run b/samples/microbenchmarks/conv1x1_vmvx_test.run
new file mode 100644
index 0000000..61ef754
--- /dev/null
+++ b/samples/microbenchmarks/conv1x1_vmvx_test.run
@@ -0,0 +1 @@
+// RUN: ${TEST_RUNNER_CMD} %S/conv1x1_test_emitc_vmvx