diff --git a/unit-test/sc_state_tests.c b/unit-test/sc_state_tests.c
index 962fcde..d3d928b 100644
--- a/unit-test/sc_state_tests.c
+++ b/unit-test/sc_state_tests.c
@@ -468,7 +468,7 @@ void SC_GetNextRtsCommand_Test_ZeroCommandLength(void)
         SC_RTS_BUFF_SIZE32 - SC_RTS_HDR_WORDS - ((SC_PACKET_MIN_SIZE + SC_RTS_HEADER_SIZE + 3) / SC_BYTES_IN_WORD) - 1;
 
     /* Set to generate error message SC_RTS_LNGTH_ERR_EID */
-    CFE_MSG_Init((CFE_MSG_Message_t *)Entry, CFE_SB_ValueToMsgId(SC_CMD_MID), SC_LAST_RTS_WITH_EVENTS - 1);
+    CFE_MSG_Init((CFE_MSG_Message_t *)Entry, CFE_SB_ValueToMsgId(SC_CMD_MID), SC_PACKET_MIN_SIZE - 1);
     MsgSize1 = SC_PACKET_MIN_SIZE - 1;
     MsgSize2 = SC_PACKET_MIN_SIZE - 1;
 
@@ -496,7 +496,7 @@ void SC_GetNextRtsCommand_Test_ZeroCommandLengthLastRts(void)
     size_t               MsgSize2;
     uint32               EntryOffsetVal;
     SC_AtsIndex_t        AtsIndex = SC_ATS_IDX_C(1);
-    SC_RtsIndex_t        RtsIndex = SC_RTS_IDX_C(SC_LAST_RTS_WITH_EVENTS);
+    SC_RtsIndex_t        RtsIndex = SC_RTS_IDX_C(SC_LAST_RTS_WITH_EVENTS - 1);
     SC_RtsInfoEntry_t *  RtsInfoPtr;
     SC_AtsInfoTable_t *  AtsInfoPtr;
 
@@ -583,7 +583,7 @@ void SC_GetNextRtsCommand_Test_EndOfBufferLastRts(void)
     size_t               MsgSize;
     SC_AtsIndex_t        AtsIndex = SC_ATS_IDX_C(1);
     uint32               EntryOffsetVal;
-    SC_RtsIndex_t        RtsIndex = SC_RTS_IDX_C(SC_LAST_RTS_WITH_EVENTS);
+    SC_RtsIndex_t        RtsIndex = SC_RTS_IDX_C(SC_LAST_RTS_WITH_EVENTS - 1);
     SC_RtsInfoEntry_t *  RtsInfoPtr;
     SC_AtsInfoTable_t *  AtsInfoPtr;