diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c
index 5e2f49b00b..5634ca3b58 100644
--- a/board/kunimitsu/board.c
+++ b/board/kunimitsu/board.c
@@ -162,6 +162,7 @@ void board_reset_pd_mcu(void)
 	gpio_set_level(GPIO_PD_RST_L, 1);
 }
 
+#ifdef HAS_TASK_MOTIONSENSE
 /* Four Motion sensors */
 /* kxcj9 mutex and local/private data*/
 static struct mutex g_kxcj9_mutex[2];
@@ -267,6 +268,7 @@ const struct accel_orientation acc_orient = {
 	},
 	.hinge_axis = {1, 0, 0},
 };
+#endif
 
 /*
  * Temperature sensors data; must be in same order as enum temp_sensor_id.
diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h
index 2a5196e5ce..2be4301767 100644
--- a/board/kunimitsu/board.h
+++ b/board/kunimitsu/board.h
@@ -113,10 +113,12 @@
 #define OPT3001_I2C_ADDR OPT3001_I2C_ADDR1
 
 /* Accelerometer */
+#ifdef HAS_TASK_MOTIONSENSE
 #define CONFIG_ACCEL_KXCJ9
 #define CONFIG_LID_ANGLE
 #define CONFIG_LID_ANGLE_SENSOR_BASE 0
 #define CONFIG_LID_ANGLE_SENSOR_LID 1
+#endif
 
 /* Modules we want to exclude */
 #undef CONFIG_CMD_ACCEL_INFO
diff --git a/board/kunimitsu/ec.tasklist b/board/kunimitsu/ec.tasklist
index beeba5c264..b8e334b52d 100644
--- a/board/kunimitsu/ec.tasklist
+++ b/board/kunimitsu/ec.tasklist
@@ -22,7 +22,6 @@
 	TASK_ALWAYS(USB_CHG_P0, usb_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK_ALWAYS(USB_CHG_P1, usb_charger_task, NULL, TASK_STACK_SIZE) \
 	TASK_ALWAYS(CHARGER, charger_task, NULL, LARGER_TASK_STACK_SIZE) \
-	TASK_NOTEST(MOTIONSENSE, motion_sense_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_NOTEST(CHIPSET, chipset_task, NULL, LARGER_TASK_STACK_SIZE) \
 	TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
 	TASK_NOTEST(PDCMD, pd_command_task, NULL, TASK_STACK_SIZE) \