diff --git a/src/main/config/config.c b/src/main/config/config.c
index 5316125f25..870b025bfb 100644
--- a/src/main/config/config.c
+++ b/src/main/config/config.c
@@ -251,14 +251,12 @@ void resetSerialConfig(serialConfig_t *serialConfig)
     }
 
     serialConfig->portConfigs[0].functionMask = FUNCTION_MSP;
-    serialConfig->portConfigs[0].identifier = serialPortIdentifiers[FIRST_PORT_INDEX];
     serialConfig->portConfigs[0].baudrate = 115200;
 
 #ifdef CC3D
     // Temporary workaround for CC3D non-functional VCP when using OpenPilot bootloader.
     // This allows MSP connection via USART so the board can be reconfigured.
     serialConfig->portConfigs[1].functionMask = FUNCTION_MSP;
-    serialConfig->portConfigs[1].identifier = serialPortIdentifiers[SECOND_PORT_INDEX];
     serialConfig->portConfigs[1].baudrate = 115200;
 #endif
 
@@ -467,9 +465,9 @@ static void resetConf(void)
     featureSet(FEATURE_FAILSAFE);
     featureClear(FEATURE_VBAT);
 #ifdef ALIENWIIF3
-    masterConfig.serialConfig.serial_port_scenario[2] = lookupScenarioIndex(SCENARIO_SERIAL_RX_ONLY);
+    masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_SERIAL_RX;
 #else
-    masterConfig.serialConfig.serial_port_scenario[1] = lookupScenarioIndex(SCENARIO_SERIAL_RX_ONLY);
+    masterConfig.serialConfig.portConfigs[1].functionMask = FUNCTION_SERIAL_RX;
 #endif
     masterConfig.rxConfig.serialrx_provider = 1;
     masterConfig.rxConfig.spektrum_sat_bind = 5;
diff --git a/src/test/unit/telemetry_hott_unittest.cc b/src/test/unit/telemetry_hott_unittest.cc
index 51fca8d5a8..2b01e9c510 100644
--- a/src/test/unit/telemetry_hott_unittest.cc
+++ b/src/test/unit/telemetry_hott_unittest.cc
@@ -186,22 +186,9 @@ void serialSetMode(serialPort_t *instance, portMode_t mode) {
     UNUSED(mode);
 }
 
-void serialSetBaudRate(serialPort_t *instance, uint32_t baudRate) {
-    UNUSED(instance);
-    UNUSED(baudRate);
-}
 
-void beginSerialPortFunction(serialPort_t *port, serialPortFunction_e function) {
-    UNUSED(port);
-    UNUSED(function);
-}
-
-void endSerialPortFunction(serialPort_t *port, serialPortFunction_e function) {
-    UNUSED(port);
-    UNUSED(function);
-}
-
-serialPort_t *openSerialPort(serialPortFunction_e functionMask, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, serialInversion_e inversion) {
+serialPort_t *openSerialPort(serialPortIdentifier_e identifier, serialPortFunction_e functionMask, serialReceiveCallbackPtr callback, uint32_t baudRate, portMode_t mode, serialInversion_e inversion) {
+    UNUSED(identifier);
     UNUSED(functionMask);
     UNUSED(baudRate);
     UNUSED(callback);
@@ -211,8 +198,13 @@ serialPort_t *openSerialPort(serialPortFunction_e functionMask, serialReceiveCal
     return NULL;
 }
 
-serialPort_t *findOpenSerialPort(uint16_t functionMask) {
-    UNUSED(functionMask);
+void closeSerialPort(serialPort_t *serialPort) {
+    UNUSED(serialPort);
+}
+
+serialPortConfig_t *findSerialPortConfig(serialPortFunction_e function) {
+    UNUSED(function);
+
     return NULL;
 }