diff --git a/drivers/can/can_shell.c b/drivers/can/can_shell.c
index 898e0edbfe3..49fadedca37 100644
--- a/drivers/can/can_shell.c
+++ b/drivers/can/can_shell.c
@@ -297,7 +297,7 @@ static int cmd_send(const struct shell *shell, size_t argc, char **argv)
 		    ext ? frame.ext_id : frame.std_id,
 		    ext ? "extended" : "standard", frame.dlc);
 
-	ret = can_send(can_dev, &frame, K_FOREVER, NULL, NULL);
+	ret = can_send(can_dev, &frame, SYS_FOREVER_MS, NULL, NULL);
 	if (ret) {
 		shell_error(shell, "Failed to send frame [%d]", ret);
 		return -EIO;
diff --git a/samples/drivers/CAN/src/main.c b/samples/drivers/CAN/src/main.c
index cdb930948e2..79d440ad592 100644
--- a/samples/drivers/CAN/src/main.c
+++ b/samples/drivers/CAN/src/main.c
@@ -257,7 +257,8 @@ void main(void)
 	while (1) {
 		change_led_frame.data[0] = toggle++ & 0x01 ? SET_LED : RESET_LED;
 		/* This sending call is none blocking. */
-		can_send(can_dev, &change_led_frame, K_FOREVER, tx_irq_callback,
+		can_send(can_dev, &change_led_frame, SYS_FOREVER_MS,
+			 tx_irq_callback,
 			 "LED change");
 		k_sleep(SLEEP_TIME);
 
diff --git a/samples/drivers/lora/receive/src/main.c b/samples/drivers/lora/receive/src/main.c
index 55ab2549828..4c353c0f6c8 100644
--- a/samples/drivers/lora/receive/src/main.c
+++ b/samples/drivers/lora/receive/src/main.c
@@ -47,7 +47,7 @@ void main(void)
 
 	while (1) {
 		/* Block until data arrives */
-		len = lora_recv(lora_dev, data, MAX_DATA_LEN, K_FOREVER,
+		len = lora_recv(lora_dev, data, MAX_DATA_LEN, SYS_FOREVER_MS,
 				&rssi, &snr);
 		if (len < 0) {
 			LOG_ERR("LoRa receive failed");
diff --git a/subsys/canbus/canopen/CO_driver.c b/subsys/canbus/canopen/CO_driver.c
index 7a101cbacec..d6c10e141c4 100644
--- a/subsys/canbus/canopen/CO_driver.c
+++ b/subsys/canbus/canopen/CO_driver.c
@@ -133,7 +133,7 @@ static void canopen_tx_retry(struct k_work *item)
 			msg.rtr = (buffer->rtr ? 1 : 0);
 			memcpy(msg.data, buffer->data, buffer->DLC);
 
-			err = can_send(CANmodule->dev, &msg, K_NO_WAIT,
+			err = can_send(CANmodule->dev, &msg, 0,
 				       canopen_tx_isr_callback, CANmodule);
 			if (err == CAN_TIMEOUT) {
 				break;
@@ -345,7 +345,7 @@ CO_ReturnError_t CO_CANsend(CO_CANmodule_t *CANmodule, CO_CANtx_t *buffer)
 	msg.rtr = (buffer->rtr ? 1 : 0);
 	memcpy(msg.data, buffer->data, buffer->DLC);
 
-	err = can_send(CANmodule->dev, &msg, K_NO_WAIT, canopen_tx_isr_callback,
+	err = can_send(CANmodule->dev, &msg, 0, canopen_tx_isr_callback,
 		       CANmodule);
 	if (err == CAN_TIMEOUT) {
 		buffer->bufferFull = true;
diff --git a/tests/drivers/uart/uart_async_api/src/test_uart_async.c b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
index aff179f6bf0..c268726decf 100644
--- a/tests/drivers/uart/uart_async_api/src/test_uart_async.c
+++ b/tests/drivers/uart/uart_async_api/src/test_uart_async.c
@@ -403,16 +403,16 @@ void test_forever_timeout(void)
 	memset(rx_buf, 0, sizeof(rx_buf));
 	memset(tx_buf, 1, sizeof(tx_buf));
 
-	uart_rx_enable(uart_dev, rx_buf, sizeof(rx_buf), K_FOREVER);
+	uart_rx_enable(uart_dev, rx_buf, sizeof(rx_buf), SYS_FOREVER_MS);
 
-	uart_tx(uart_dev, tx_buf, 5, K_FOREVER);
+	uart_tx(uart_dev, tx_buf, 5, SYS_FOREVER_MS);
 	zassert_not_equal(k_sem_take(&tx_aborted, K_MSEC(1000)), 0,
 			  "TX_ABORTED timeout");
 	zassert_equal(k_sem_take(&tx_done, K_MSEC(100)), 0, "TX_DONE timeout");
 	zassert_not_equal(k_sem_take(&rx_rdy, K_MSEC(1000)), 0,
 			  "RX_RDY timeout");
 
-	uart_tx(uart_dev, tx_buf, 95, K_FOREVER);
+	uart_tx(uart_dev, tx_buf, 95, SYS_FOREVER_MS);
 
 	zassert_not_equal(k_sem_take(&tx_aborted, K_MSEC(1000)), 0,
 			  "TX_ABORTED timeout");