diff --git a/libraries/AP_HAL_SITL/SITL_Periph_State.h b/libraries/AP_HAL_SITL/SITL_Periph_State.h
index 77626f21ea..08462d7d1c 100644
--- a/libraries/AP_HAL_SITL/SITL_Periph_State.h
+++ b/libraries/AP_HAL_SITL/SITL_Periph_State.h
@@ -54,7 +54,7 @@ public:
     uint16_t voltage2_pin_value;  // pin 15
     uint16_t current2_pin_value;  // pin 14
     // paths for UART devices
-    const char *_uart_path[7] {
+    const char *_uart_path[9] {
         "none:0",
         "fifo:gps",
         "none:1",
@@ -62,6 +62,8 @@ public:
         "none:3",
         "none:4",
         "none:5",
+        "none:6",
+        "none:7",
     };
 
     uint8_t get_instance() const { return _instance; }
diff --git a/libraries/AP_HAL_SITL/SITL_State.h b/libraries/AP_HAL_SITL/SITL_State.h
index 90bd0bf28b..b6e2e9165a 100644
--- a/libraries/AP_HAL_SITL/SITL_State.h
+++ b/libraries/AP_HAL_SITL/SITL_State.h
@@ -104,7 +104,7 @@ public:
     uint16_t current2_pin_value;  // pin 14
 
     // paths for UART devices
-    const char *_uart_path[7] {
+    const char *_uart_path[9] {
         "tcp:0:wait",
         "GPS1",
         "tcp:2",
@@ -112,6 +112,8 @@ public:
         "GPS2",
         "tcp:5",
         "tcp:6",
+        "tcp:7",
+        "tcp:8",
     };
     std::vector<struct AP_Param::defaults_table_struct> cmdline_param;
 
diff --git a/libraries/AP_HAL_SITL/SITL_cmdline.cpp b/libraries/AP_HAL_SITL/SITL_cmdline.cpp
index 546fd4ffbb..16b58b2056 100644
--- a/libraries/AP_HAL_SITL/SITL_cmdline.cpp
+++ b/libraries/AP_HAL_SITL/SITL_cmdline.cpp
@@ -408,6 +408,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[])
         case CMDLINE_UARTF:
         case CMDLINE_UARTG:
         case CMDLINE_UARTH:
+        case CMDLINE_UARTI:
             _uart_path[opt - CMDLINE_UARTA] = gopt.optarg;
             break;
         case CMDLINE_SERIAL0:
@@ -418,6 +419,7 @@ void SITL_State::_parse_command_line(int argc, char * const argv[])
         case CMDLINE_SERIAL5:
         case CMDLINE_SERIAL6:
         case CMDLINE_SERIAL7:
+        case CMDLINE_SERIAL8:
             _uart_path[opt - CMDLINE_SERIAL0] = gopt.optarg;
             break;
         case CMDLINE_RTSCTS: