diff --git a/boards/olimex-msp430-h2618/Kconfig b/boards/olimex-msp430-h2618/Kconfig
new file mode 100644
index 0000000000..20b4e0b6d2
--- /dev/null
+++ b/boards/olimex-msp430-h2618/Kconfig
@@ -0,0 +1,18 @@
+# Copyright (c) 2020 HAW Hamburg
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+
+config BOARD
+ default "olimex-msp430-h2618" if BOARD_OLIMEX_MSP430_H2618
+
+config BOARD_OLIMEX_MSP430_H2618
+ bool
+ default y
+ select CPU_MODEL_MSP430F2618
+ select HAS_PERIPH_GPIO
+ select HAS_PERIPH_GPIO_IRQ
+ select HAS_PERIPH_SPI
+ select HAS_PERIPH_TIMER
+ select HAS_PERIPH_UART
diff --git a/boards/olimex-msp430-h2618/Makefile b/boards/olimex-msp430-h2618/Makefile
new file mode 100644
index 0000000000..f8fcbb53a0
--- /dev/null
+++ b/boards/olimex-msp430-h2618/Makefile
@@ -0,0 +1,3 @@
+MODULE = board
+
+include $(RIOTBASE)/Makefile.base
diff --git a/boards/olimex-msp430-h2618/Makefile.features b/boards/olimex-msp430-h2618/Makefile.features
new file mode 100644
index 0000000000..8250f412f7
--- /dev/null
+++ b/boards/olimex-msp430-h2618/Makefile.features
@@ -0,0 +1,10 @@
+CPU = msp430fxyz
+CPU_MODEL = msp430f2618
+
+# Put defined MCU peripherals here (in alphabetical order)
+FEATURES_PROVIDED += periph_gpio periph_gpio_irq
+FEATURES_PROVIDED += periph_spi
+FEATURES_PROVIDED += periph_timer
+FEATURES_PROVIDED += periph_uart
+
+# Various other features (if any)
diff --git a/boards/olimex-msp430-h2618/Makefile.include b/boards/olimex-msp430-h2618/Makefile.include
new file mode 100644
index 0000000000..d49e656df6
--- /dev/null
+++ b/boards/olimex-msp430-h2618/Makefile.include
@@ -0,0 +1,26 @@
+# set default port depending on operating system
+PORT_LINUX ?= /dev/ttyUSB0
+PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-MXV*)))
+
+# flash tool configuration
+PROGRAMMER ?= mspdebug
+MSPDEBUG_PROGRAMMER ?= olimex
+
+PROGRAMMERS_SUPPORTED += mspdebug
+
+# When freshly plugged in the Olimex MSP430-JTAG-Tiny debugger provides a
+# ttyACM interface, which is only available until the first flashing. A
+# `make term` or even a `make flash term` may pick the JTAG debugger instead
+# of the correct USB TTL adapter when the JTAG programmer is plugged in after
+# the TTL adapter and `MOST_RECENT_PORT=1` is used.
+#
+# To fix that, we filter first by the most common USB TTL adapter drivers and
+# fall back to all TTY when no such TTL adapter is found.
+TTY_BOARD_FILTER := --driver 'cp210x|ch341|ftdi_sio'
+TTY_SELECT_CMD := $(RIOTTOOLS)/usb-serial/ttys.py \
+ --most-recent \
+ --format path serial \
+ $(TTY_BOARD_FILTER) || \
+ $(RIOTTOOLS)/usb-serial/ttys.py \
+ --most-recent \
+ --format path serial
diff --git a/boards/olimex-msp430-h2618/doc.txt b/boards/olimex-msp430-h2618/doc.txt
new file mode 100644
index 0000000000..51d68abdca
--- /dev/null
+++ b/boards/olimex-msp430-h2618/doc.txt
@@ -0,0 +1,111 @@
+/**
+@defgroup boards_olimex_msp430_h2618 Olimex MSP430-H2618
+@ingroup boards
+@brief Support for the Olimex MSP430-H2618 board
+
+
+
+## MCU
+
+| MCU | TI MSP430F2618 |
+|:----------------- |:------------------------------------------------------------- |
+| Family | MSP430 |
+| Vendor | Texas Instruments |
+| Package | 64 QFN |
+| RAM | 8 KiB |
+| Flash | 116 KiB |
+| Frequency | 16 MHz |
+| FPU | no |
+| Timers | 2 (2x 16bit) |
+| ADCs | 1x 8 channel 12-bit |
+| UARTs | 2 |
+| SPIs | 2 |
+| I2Cs | 1 |
+| Vcc | 1.8 V - 3.6 V |
+| Datasheet MCU | [Datasheet MSP430F2618] |
+| User Guide MCU | [User Guide MSP430F2xx] |
+| Datasheet Board | [Datasheet Olimex MSP430-H2618] |
+| Website | [Website Olimex MSP430-H2618] |
+
+[Datasheet MSP430F2618]: https://www.ti.com/lit/gpn/msp430f2618
+[User Guide MSP430F2xx]: https://www.ti.com/lit/pdf/slau144
+[Datasheet Olimex MSP430-H2618]: https://www.olimex.com/Products/MSP430/Header/MSP430-H2618/resources/MSP430-H2618.pdf
+[Website Olimex MSP430-H2618]: https://www.olimex.com/Products/MSP430/Header/MSP430-H2618/
+
+@warning While erasing or writing to the flash, the MCU must be powered by
+ at least 2.2 V
+
+## Schematics
+
+
+
+## Pinout
+
+The 64 pins on the edges of the PCB are connected to the corresponding MCU pins.
+Hence, the following pinout of the naked MSP430-F2618 MCU chip matches the
+pinout of the header board:
+
+
+
+## Flashing RIOT
+
+
+
+Connect the board to a JTAG debugger supported by
+[mspdebug](https://dlbeer.co.nz/mspdebug/); by default the
+Olimex MSP430-JTAG-Tiny (as shown in the picture above) is assumed, which is
+among the less expensive options.
+
+@note If you are not using the Olimex MSP430-JTAG-Tiny (or a compatible
+ programmer), set `MSPDEBUG_PROGRAMMER` to the correct value via
+ an environment variable or as parameter to make. E.g. use
+ `make BOARD=olimex-msp430-h2618 MSPDEBUG_PROGRAMMER=bus-pirate` to
+ flash using the bus pirate.
+
+@warning You can power the board via the JTAG programmer by placing a
+ jumper at `P_IN`. However, the JTAG programmer will only be able
+ to provide a limited current. You may want to disconnect the
+ header board from devices consuming a lot of power prior to
+ flashing.
+
+@warning If the board is powered externally, make sure to place the jumper
+ in `P_OUT` position, not in `P_IN` position.
+
+@warning A jumper in `P_OUT` is mutually exclusive to a jumper in `P_IN`.
+ Never connect both at the same time.
+
+@note Pin 1 on the JTAG connector has a small white triangle next to it
+ and square pad, compared to the round pad used by all other JTAG
+ pins.
+
+@warning The Olimex MSP430-JTAG-Tiny will fail to flash or debug the board
+ until the latest firmware is installed. For that, install the
+ Windows-only programmer software and update the DLLs files to
+ contain the latest firmware as described in the website. The
+ software will update the programmer upon launch.
+
+Once the jumper is correctly placed in either `P_IN` or in `P_OUT` and the
+JTAG cable is connected just run
+
+```
+make BOARD=olimex-msp430-h2618 flash
+```
+
+## Using the shell
+
+stdio is available via the UART interface with `TXD = P3.4`
+(pin 35 on the header) and `RXD = P3.5` (pin 34 on the header) at 115,200 Baud.
+
+The easiest way is to connect an USB TTL adapter (such as the cheap `cp210x`
+or `ch341` based adapters) as follows:
+
+```
+TTL adapter Olimex MSP430-H2618
+----------- -------------------
+
+ GND --- 63 (DV_SS)
+ TXD --- 33 (P3.5)
+ RXD --- 32 (P3.4)
+```
+
+ */
diff --git a/boards/olimex-msp430-h2618/include/board.h b/boards/olimex-msp430-h2618/include/board.h
new file mode 100644
index 0000000000..f7f660f1d2
--- /dev/null
+++ b/boards/olimex-msp430-h2618/include/board.h
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013, 2014 INRIA
+ * 2015 Freie Universität Berlin
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup boards_olimex_msp430_h2618
+ *
+ * @{
+ *
+ * @file
+ * @brief Basic definitions for the Olimex MSP430-H2618 board
+ *
+ * @author Marian Buschsieweke
+ */
+
+#ifndef BOARD_H
+#define BOARD_H
+
+#include "cpu.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @brief Define the CPU model for the
+ */
+#ifndef __MSP430F2618__
+#define __MSP430F2618__
+#endif
+
+/**
+ * @name Xtimer configuration
+ * @{
+ */
+#define XTIMER_WIDTH (16)
+#define XTIMER_BACKOFF (40)
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+/** @} */
+#endif /* BOARD_H */
diff --git a/boards/olimex-msp430-h2618/include/periph_conf.h b/boards/olimex-msp430-h2618/include/periph_conf.h
new file mode 100644
index 0000000000..92acdb9d1e
--- /dev/null
+++ b/boards/olimex-msp430-h2618/include/periph_conf.h
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2014 INRIA
+ * 2015 Freie Universität Berlin
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser General
+ * Public License v2.1. See the file LICENSE in the top level directory for more
+ * details.
+ */
+
+/**
+ * @ingroup boards_olimex_msp430_h2618
+ * @{
+ *
+ * @file
+ * @brief Olimex-MSP430-H2618 peripheral configuration
+ *
+ * @author Marian Buschsieweke
+ */
+
+#ifndef PERIPH_CONF_H
+#define PERIPH_CONF_H
+
+#include "periph_cpu.h"
+#include "macros/units.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define CLOCK_CORECLOCK msp430_fxyz_dco_freq
+
+/**
+ * @brief Clock configuration
+ */
+static const msp430_fxyz_clock_params_t clock_params = {
+ .target_dco_frequency = MHZ(16),
+ .lfxt1_frequency = 32768,
+ .main_clock_source = MAIN_CLOCK_SOURCE_DCOCLK,
+ .submain_clock_source = SUBMAIN_CLOCK_SOURCE_DCOCLK,
+ .main_clock_divier = MAIN_CLOCK_DIVIDE_BY_1,
+ .submain_clock_divier = SUBMAIN_CLOCK_DIVIDE_BY_1,
+ .auxiliary_clock_divier = AUXILIARY_CLOCK_DIVIDE_BY_1,
+};
+
+/**
+ * @name Timer configuration
+ * @{
+ */
+#define TIMER_NUMOF (1U)
+#define TIMER_BASE (TIMER_A)
+#define TIMER_CHAN (3)
+#define TIMER_ISR_CC0 (TIMERA0_VECTOR)
+#define TIMER_ISR_CCX (TIMERA1_VECTOR)
+/** @} */
+
+/**
+ * @name UART configuration
+ * @{
+ */
+#define UART_NUMOF (1U)
+
+#define UART_USE_USCI
+#define UART_BASE (USCI_0)
+#define UART_IE (SFR->IE2)
+#define UART_IF (SFR->IFG2)
+#define UART_IE_RX_BIT (1 << 0)
+#define UART_IE_TX_BIT (1 << 1)
+#define UART_RX_PORT ((msp_port_t *)PORT_3)
+#define UART_RX_PIN (1 << 5)
+#define UART_TX_PORT ((msp_port_t *)PORT_3)
+#define UART_TX_PIN (1 << 4)
+#define UART_RX_ISR (USCIAB0RX_VECTOR)
+#define UART_TX_ISR (USCIAB0TX_VECTOR)
+/** @} */
+
+/**
+ * @name SPI configuration
+ * @{
+ */
+#define SPI_NUMOF (1U)
+
+/* SPI configuration */
+#define SPI_USE_USCI
+#define SPI_BASE (USCI_0_B_SPI)
+#define SPI_IE (SFR->IE2)
+#define SPI_IF (SFR->IFG2)
+#define SPI_IE_RX_BIT (1 << 2)
+#define SPI_IE_TX_BIT (1 << 3)
+#define SPI_PIN_MISO GPIO_PIN(P3, 2)
+#define SPI_PIN_MOSI GPIO_PIN(P3, 1)
+#define SPI_PIN_CLK GPIO_PIN(P3, 3)
+/** @} */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* PERIPH_CONF_H */
+/** @} */
diff --git a/examples/asymcute_mqttsn/Makefile.ci b/examples/asymcute_mqttsn/Makefile.ci
index aba6e40166..8dc98115a9 100644
--- a/examples/asymcute_mqttsn/Makefile.ci
+++ b/examples/asymcute_mqttsn/Makefile.ci
@@ -35,6 +35,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/benchmark_udp/Makefile.ci b/examples/benchmark_udp/Makefile.ci
index bd398dea3a..eba11c98a8 100644
--- a/examples/benchmark_udp/Makefile.ci
+++ b/examples/benchmark_udp/Makefile.ci
@@ -25,6 +25,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/cord_ep/Makefile.ci b/examples/cord_ep/Makefile.ci
index 53712c77cd..64d1cc9b4f 100644
--- a/examples/cord_ep/Makefile.ci
+++ b/examples/cord_ep/Makefile.ci
@@ -25,6 +25,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/cord_lc/Makefile.ci b/examples/cord_lc/Makefile.ci
index 1ed53f31a0..4fc7181f29 100644
--- a/examples/cord_lc/Makefile.ci
+++ b/examples/cord_lc/Makefile.ci
@@ -26,6 +26,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/dtls-echo/Makefile.ci b/examples/dtls-echo/Makefile.ci
index cba0cb9af7..3dbb75dc19 100644
--- a/examples/dtls-echo/Makefile.ci
+++ b/examples/dtls-echo/Makefile.ci
@@ -39,6 +39,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/emcute_mqttsn/Makefile.ci b/examples/emcute_mqttsn/Makefile.ci
index c0fb6c41ec..8f2f730871 100644
--- a/examples/emcute_mqttsn/Makefile.ci
+++ b/examples/emcute_mqttsn/Makefile.ci
@@ -28,6 +28,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/gcoap/Makefile.ci b/examples/gcoap/Makefile.ci
index f2810be9e2..1c0c26dffd 100644
--- a/examples/gcoap/Makefile.ci
+++ b/examples/gcoap/Makefile.ci
@@ -22,6 +22,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/gcoap_block_server/Makefile.ci b/examples/gcoap_block_server/Makefile.ci
index 41a19752cf..62501fd2c5 100644
--- a/examples/gcoap_block_server/Makefile.ci
+++ b/examples/gcoap_block_server/Makefile.ci
@@ -23,6 +23,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/gcoap_dtls/Makefile.ci b/examples/gcoap_dtls/Makefile.ci
index 23509f16d1..88e4c2533a 100644
--- a/examples/gcoap_dtls/Makefile.ci
+++ b/examples/gcoap_dtls/Makefile.ci
@@ -43,6 +43,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/gcoap_fileserver/Makefile.ci b/examples/gcoap_fileserver/Makefile.ci
index c6af57aaa5..5e71e7ef18 100644
--- a/examples/gcoap_fileserver/Makefile.ci
+++ b/examples/gcoap_fileserver/Makefile.ci
@@ -25,6 +25,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/gnrc_border_router/Makefile.ci b/examples/gnrc_border_router/Makefile.ci
index 8113744876..44119736a1 100644
--- a/examples/gnrc_border_router/Makefile.ci
+++ b/examples/gnrc_border_router/Makefile.ci
@@ -48,6 +48,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \
nucleo-l073rz \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
opencm904 \
samd10-xmini \
diff --git a/examples/gnrc_networking/Makefile.ci b/examples/gnrc_networking/Makefile.ci
index 460ae4620c..d2f18431ce 100644
--- a/examples/gnrc_networking/Makefile.ci
+++ b/examples/gnrc_networking/Makefile.ci
@@ -24,6 +24,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/gnrc_networking_subnets/Makefile.ci b/examples/gnrc_networking_subnets/Makefile.ci
index 3a01e7f5cc..a95e99a05d 100644
--- a/examples/gnrc_networking_subnets/Makefile.ci
+++ b/examples/gnrc_networking_subnets/Makefile.ci
@@ -24,6 +24,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/paho-mqtt/Makefile.ci b/examples/paho-mqtt/Makefile.ci
index cba0cb9af7..3dbb75dc19 100644
--- a/examples/paho-mqtt/Makefile.ci
+++ b/examples/paho-mqtt/Makefile.ci
@@ -39,6 +39,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/examples/posix_sockets/Makefile.ci b/examples/posix_sockets/Makefile.ci
index 490076c1db..2be5c5c00a 100644
--- a/examples/posix_sockets/Makefile.ci
+++ b/examples/posix_sockets/Makefile.ci
@@ -29,6 +29,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/examples/telnet_server/Makefile.ci b/examples/telnet_server/Makefile.ci
index f2810be9e2..1c0c26dffd 100644
--- a/examples/telnet_server/Makefile.ci
+++ b/examples/telnet_server/Makefile.ci
@@ -22,6 +22,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/bench/xtimer/Makefile.ci b/tests/bench/xtimer/Makefile.ci
index 6fe5209637..f7326e89d4 100644
--- a/tests/bench/xtimer/Makefile.ci
+++ b/tests/bench/xtimer/Makefile.ci
@@ -3,6 +3,7 @@ BOARD_INSUFFICIENT_MEMORY := \
im880b \
nucleo-l011k4 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
samd10-xmini \
slstk3400a \
diff --git a/tests/bench/ztimer/Makefile.ci b/tests/bench/ztimer/Makefile.ci
index 6fe5209637..f7326e89d4 100644
--- a/tests/bench/ztimer/Makefile.ci
+++ b/tests/bench/ztimer/Makefile.ci
@@ -3,6 +3,7 @@ BOARD_INSUFFICIENT_MEMORY := \
im880b \
nucleo-l011k4 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
samd10-xmini \
slstk3400a \
diff --git a/tests/drivers/cc110x/Makefile.ci b/tests/drivers/cc110x/Makefile.ci
index f61b73d661..d146724980 100644
--- a/tests/drivers/cc110x/Makefile.ci
+++ b/tests/drivers/cc110x/Makefile.ci
@@ -30,6 +30,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/emcute/Makefile.ci b/tests/net/emcute/Makefile.ci
index 587d95f9f0..fadc77033c 100644
--- a/tests/net/emcute/Makefile.ci
+++ b/tests/net/emcute/Makefile.ci
@@ -45,6 +45,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \
nucleo-l073rz \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
opencm904 \
samd10-xmini \
saml10-xpro \
diff --git a/tests/net/gcoap_dns/Makefile.ci b/tests/net/gcoap_dns/Makefile.ci
index d2263c4e10..dc9eee89f7 100644
--- a/tests/net/gcoap_dns/Makefile.ci
+++ b/tests/net/gcoap_dns/Makefile.ci
@@ -35,6 +35,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gcoap_fileserver/Makefile.ci b/tests/net/gcoap_fileserver/Makefile.ci
index cb1f47ca1b..1dbe055337 100644
--- a/tests/net/gcoap_fileserver/Makefile.ci
+++ b/tests/net/gcoap_fileserver/Makefile.ci
@@ -31,6 +31,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_dhcpv6_client/Makefile.ci b/tests/net/gnrc_dhcpv6_client/Makefile.ci
index 7ffd511d9f..e3a56765f1 100644
--- a/tests/net/gnrc_dhcpv6_client/Makefile.ci
+++ b/tests/net/gnrc_dhcpv6_client/Makefile.ci
@@ -27,6 +27,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci b/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci
index c98a5d6fe6..b8be057028 100644
--- a/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci
+++ b/tests/net/gnrc_dhcpv6_client_6lbr/Makefile.ci
@@ -49,6 +49,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \
nucleo-l073rz \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
opencm904 \
samd10-xmini \
diff --git a/tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci b/tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci
index 64b0903af3..cf0b491c6d 100644
--- a/tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci
+++ b/tests/net/gnrc_dhcpv6_client_stateless/Makefile.ci
@@ -36,6 +36,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_dhcpv6_relay/Makefile.ci b/tests/net/gnrc_dhcpv6_relay/Makefile.ci
index ca44d76c0a..74158cef79 100644
--- a/tests/net/gnrc_dhcpv6_relay/Makefile.ci
+++ b/tests/net/gnrc_dhcpv6_relay/Makefile.ci
@@ -25,6 +25,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_ipv6_ext/Makefile.ci b/tests/net/gnrc_ipv6_ext/Makefile.ci
index a81278b34f..bd83e713b5 100644
--- a/tests/net/gnrc_ipv6_ext/Makefile.ci
+++ b/tests/net/gnrc_ipv6_ext/Makefile.ci
@@ -25,6 +25,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_ipv6_ext_frag/Makefile.ci b/tests/net/gnrc_ipv6_ext_frag/Makefile.ci
index cf1e8866e7..ada7593b43 100644
--- a/tests/net/gnrc_ipv6_ext_frag/Makefile.ci
+++ b/tests/net/gnrc_ipv6_ext_frag/Makefile.ci
@@ -32,6 +32,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_ipv6_ext_opt/Makefile.ci b/tests/net/gnrc_ipv6_ext_opt/Makefile.ci
index 4e4ea48496..cf8668865e 100644
--- a/tests/net/gnrc_ipv6_ext_opt/Makefile.ci
+++ b/tests/net/gnrc_ipv6_ext_opt/Makefile.ci
@@ -20,6 +20,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci b/tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci
index d6992f8eb0..85ed3d4e3b 100644
--- a/tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci
+++ b/tests/net/gnrc_ipv6_fwd_w_sub/Makefile.ci
@@ -17,6 +17,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_ipv6_nib/Makefile.ci b/tests/net/gnrc_ipv6_nib/Makefile.ci
index f9b2ea241a..52f631b8da 100644
--- a/tests/net/gnrc_ipv6_nib/Makefile.ci
+++ b/tests/net/gnrc_ipv6_nib/Makefile.ci
@@ -13,6 +13,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
nucleo-l031k6 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
stk3200 \
stm32f030f4-demo \
diff --git a/tests/net/gnrc_ipv6_nib_6ln/Makefile.ci b/tests/net/gnrc_ipv6_nib_6ln/Makefile.ci
index d6992f8eb0..85ed3d4e3b 100644
--- a/tests/net/gnrc_ipv6_nib_6ln/Makefile.ci
+++ b/tests/net/gnrc_ipv6_nib_6ln/Makefile.ci
@@ -17,6 +17,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_ipv6_nib_dns/Makefile.ci b/tests/net/gnrc_ipv6_nib_dns/Makefile.ci
index 4a40bb7a1e..22888f587c 100644
--- a/tests/net/gnrc_ipv6_nib_dns/Makefile.ci
+++ b/tests/net/gnrc_ipv6_nib_dns/Makefile.ci
@@ -19,6 +19,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_netif/Makefile.ci b/tests/net/gnrc_netif/Makefile.ci
index ed51ee198c..067eb55d89 100644
--- a/tests/net/gnrc_netif/Makefile.ci
+++ b/tests/net/gnrc_netif/Makefile.ci
@@ -50,6 +50,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \
nucleo-l073rz \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
opencm904 \
samd10-xmini \
diff --git a/tests/net/gnrc_rpl/Makefile.ci b/tests/net/gnrc_rpl/Makefile.ci
index 381b8933dc..b365d2ebab 100644
--- a/tests/net/gnrc_rpl/Makefile.ci
+++ b/tests/net/gnrc_rpl/Makefile.ci
@@ -26,6 +26,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_rpl_srh/Makefile.ci b/tests/net/gnrc_rpl_srh/Makefile.ci
index a3d5e41f7d..10ef03f547 100644
--- a/tests/net/gnrc_rpl_srh/Makefile.ci
+++ b/tests/net/gnrc_rpl_srh/Makefile.ci
@@ -29,6 +29,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan/Makefile.ci b/tests/net/gnrc_sixlowpan/Makefile.ci
index 7172ca67c7..ba40f223b7 100644
--- a/tests/net/gnrc_sixlowpan/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan/Makefile.ci
@@ -24,6 +24,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci
index cf1e8866e7..ada7593b43 100644
--- a/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan_frag_minfwd/Makefile.ci
@@ -32,6 +32,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci
index 7e580c3e71..5be0cfe5e8 100644
--- a/tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan_frag_sfr/Makefile.ci
@@ -34,6 +34,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci
index 70e624db44..02c05b4876 100644
--- a/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure/Makefile.ci
@@ -34,6 +34,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci
index 5e9935301f..052c856477 100644
--- a/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan_frag_sfr_congure_impl/Makefile.ci
@@ -39,6 +39,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci b/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci
index d6992f8eb0..85ed3d4e3b 100644
--- a/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci
+++ b/tests/net/gnrc_sixlowpan_iphc_w_vrb/Makefile.ci
@@ -17,6 +17,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_sock_dns/Makefile.ci b/tests/net/gnrc_sock_dns/Makefile.ci
index 7d8085b2ab..5210a715de 100644
--- a/tests/net/gnrc_sock_dns/Makefile.ci
+++ b/tests/net/gnrc_sock_dns/Makefile.ci
@@ -21,6 +21,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/gnrc_sock_dodtls/Makefile.ci b/tests/net/gnrc_sock_dodtls/Makefile.ci
index cf1e8866e7..ada7593b43 100644
--- a/tests/net/gnrc_sock_dodtls/Makefile.ci
+++ b/tests/net/gnrc_sock_dodtls/Makefile.ci
@@ -32,6 +32,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_sock_tcp/Makefile.ci b/tests/net/gnrc_sock_tcp/Makefile.ci
index a684eda10b..3a5a04a981 100644
--- a/tests/net/gnrc_sock_tcp/Makefile.ci
+++ b/tests/net/gnrc_sock_tcp/Makefile.ci
@@ -30,6 +30,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_tcp/Makefile.ci b/tests/net/gnrc_tcp/Makefile.ci
index f1ecd754da..d0600eb481 100644
--- a/tests/net/gnrc_tcp/Makefile.ci
+++ b/tests/net/gnrc_tcp/Makefile.ci
@@ -29,6 +29,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_tx_sync/Makefile.ci b/tests/net/gnrc_tx_sync/Makefile.ci
index bba1816d88..4b06bd400b 100644
--- a/tests/net/gnrc_tx_sync/Makefile.ci
+++ b/tests/net/gnrc_tx_sync/Makefile.ci
@@ -32,6 +32,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/gnrc_udp/Makefile.ci b/tests/net/gnrc_udp/Makefile.ci
index 2ccd7330f4..1bd8cadb9c 100644
--- a/tests/net/gnrc_udp/Makefile.ci
+++ b/tests/net/gnrc_udp/Makefile.ci
@@ -38,6 +38,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
saml10-xpro \
saml11-xpro \
diff --git a/tests/net/nanocoap_cli/Makefile.ci b/tests/net/nanocoap_cli/Makefile.ci
index 1cef52ce36..8797bed939 100644
--- a/tests/net/nanocoap_cli/Makefile.ci
+++ b/tests/net/nanocoap_cli/Makefile.ci
@@ -23,6 +23,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
seeedstudio-gd32 \
slstk3400a \
diff --git a/tests/net/sntp/Makefile.ci b/tests/net/sntp/Makefile.ci
index 3a607b97b9..45b5a238f8 100644
--- a/tests/net/sntp/Makefile.ci
+++ b/tests/net/sntp/Makefile.ci
@@ -19,6 +19,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/net/sock_udp_aux/Makefile.ci b/tests/net/sock_udp_aux/Makefile.ci
index 0370076302..b327a263e7 100644
--- a/tests/net/sock_udp_aux/Makefile.ci
+++ b/tests/net/sock_udp_aux/Makefile.ci
@@ -22,6 +22,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/pkg/elk/Makefile.ci b/tests/pkg/elk/Makefile.ci
index 1c357ecf04..39c5002313 100644
--- a/tests/pkg/elk/Makefile.ci
+++ b/tests/pkg/elk/Makefile.ci
@@ -6,6 +6,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
nucleo-l031k6 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
stk3200 \
stm32f030f4-demo \
diff --git a/tests/pkg/libb2/Makefile.ci b/tests/pkg/libb2/Makefile.ci
index 9d5f26c0ec..b6952ca4e7 100644
--- a/tests/pkg/libb2/Makefile.ci
+++ b/tests/pkg/libb2/Makefile.ci
@@ -7,6 +7,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
nucleo-l031k6 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
stk3200 \
stm32f030f4-demo \
diff --git a/tests/pkg/relic/Makefile.ci b/tests/pkg/relic/Makefile.ci
index 3a38f8e121..65d8a74e98 100644
--- a/tests/pkg/relic/Makefile.ci
+++ b/tests/pkg/relic/Makefile.ci
@@ -10,6 +10,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/pkg/spiffs/Makefile.ci b/tests/pkg/spiffs/Makefile.ci
index 3e85f60997..fbfb6472e8 100644
--- a/tests/pkg/spiffs/Makefile.ci
+++ b/tests/pkg/spiffs/Makefile.ci
@@ -16,6 +16,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l031k6 \
nucleo-l053r8 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
slstk3400a \
stk3200 \
diff --git a/tests/pkg/tinydtls_sock_async/Makefile.ci b/tests/pkg/tinydtls_sock_async/Makefile.ci
index c98a5d6fe6..b8be057028 100644
--- a/tests/pkg/tinydtls_sock_async/Makefile.ci
+++ b/tests/pkg/tinydtls_sock_async/Makefile.ci
@@ -49,6 +49,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l053r8 \
nucleo-l073rz \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
opencm904 \
samd10-xmini \
diff --git a/tests/sys/crypto/Makefile.ci b/tests/sys/crypto/Makefile.ci
index 66c3aaadf3..f47ee57ec9 100644
--- a/tests/sys/crypto/Makefile.ci
+++ b/tests/sys/crypto/Makefile.ci
@@ -18,6 +18,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
nucleo-l031k6 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
stk3200 \
stm32f030f4-demo \
diff --git a/tests/sys/crypto_aes_ccm/Makefile.ci b/tests/sys/crypto_aes_ccm/Makefile.ci
index 66c3aaadf3..f47ee57ec9 100644
--- a/tests/sys/crypto_aes_ccm/Makefile.ci
+++ b/tests/sys/crypto_aes_ccm/Makefile.ci
@@ -18,6 +18,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-l011k4 \
nucleo-l031k6 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
samd10-xmini \
stk3200 \
stm32f030f4-demo \
diff --git a/tests/unittests/Makefile.ci b/tests/unittests/Makefile.ci
index f88f7a3733..acefc781a3 100644
--- a/tests/unittests/Makefile.ci
+++ b/tests/unittests/Makefile.ci
@@ -72,6 +72,7 @@ BOARD_INSUFFICIENT_MEMORY := \
nucleo-wl55jc \
nz32-sc151 \
olimex-msp430-h1611 \
+ olimex-msp430-h2618 \
olimexino-stm32 \
opencm904 \
openlabs-kw41z-mini-256kib \