diff --git a/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp b/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
index 913ff0b2cf..068aeb0b4d 100644
--- a/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
+++ b/TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp
@@ -338,7 +338,7 @@ Case cases[] = {
     Case("38400, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<38400, 8, ParityNone, 1, false> >),
     Case("115200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<115200, 8, ParityNone, 1, false> >),
     // stop bits
-#if !defined(TARGET_NRF52840)
+#if !defined(UART_TWO_STOP_BITS_NOT_SUPPORTED)
     Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, fpga_uart_test_common_no_fc<9600, 8, ParityNone, 2, false> >),
 #endif
 
@@ -357,12 +357,12 @@ Case cases[] = {
     Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<115200, 8, ParityNone, 1, false> >),
     // data bits: not tested (some platforms support 8 bits only)
     // parity
-#if !defined(TARGET_NRF52840)
+#if !defined(UART_ODD_PARITY_NOT_SUPPORTED)
     Case("9600, 8O1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityOdd, 1, false> >),
 #endif
     Case("9600, 8E1, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityEven, 1, false> >),
     // stop bits
-#if !defined(TARGET_NRF52840)
+#if !defined(UART_TWO_STOP_BITS_NOT_SUPPORTED)
     Case("9600, 8N2, FC on", one_peripheral<UARTPort, DefaultFormFactor, fpga_uart_test_common<9600, 8, ParityNone, 2, false> >),
 #endif
 #endif
diff --git a/targets/targets.json b/targets/targets.json
index 88e2fb2cad..ad85c32006 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2441,7 +2441,7 @@
             "TRNG",
             "FLASH",
             "WATCHDOG"
-        ],        
+        ],
         "release_versions": [
             "2",
             "5"
@@ -2464,7 +2464,7 @@
             "FSL_RTOS_MBED",
             "USE_EXTERNAL_RTC"
         ],
-        "default_toolchain": "ARM",        
+        "default_toolchain": "ARM",
         "forced_reset_timeout": 7,
         "release_versions": [
             "2",
@@ -11097,7 +11097,9 @@
             "WSF_MAX_HANDLERS=10",
             "MBED_MPU_CUSTOM",
             "SWI_DISABLE0",
-            "NRF52_PAN_20"
+            "NRF52_PAN_20",
+            "UART_TWO_STOP_BITS_NOT_SUPPORTED",
+            "UART_ODD_PARITY_NOT_SUPPORTED"
         ],
         "features": [
             "CRYPTOCELL310",
@@ -14128,7 +14130,7 @@
             "smclk_select": "HFXT",
             "smclk_div": "DIV2",
             "adc_auto_scan": 1
-        },        
+        },
         "release_versions": [
             "2",
             "5"