diff --git a/Svc/RateGroupDriver/test/ut/RateGroupDriverImplTester.hpp b/Svc/RateGroupDriver/test/ut/RateGroupDriverImplTester.hpp
index d03cce40557..a7e32f6c7f2 100644
--- a/Svc/RateGroupDriver/test/ut/RateGroupDriverImplTester.hpp
+++ b/Svc/RateGroupDriver/test/ut/RateGroupDriverImplTester.hpp
@@ -30,7 +30,7 @@ namespace Svc {
 
             void clearPortCalls();
 
-            bool m_portCalls[3];
+            bool m_portCalls[Svc::RateGroupDriver::DIVIDER_SIZE];
 
     };
 
diff --git a/Svc/RateGroupDriver/test/ut/RateGroupDriverTester.cpp b/Svc/RateGroupDriver/test/ut/RateGroupDriverTester.cpp
index 9d29206d15f..1e31e71c8b5 100644
--- a/Svc/RateGroupDriver/test/ut/RateGroupDriverTester.cpp
+++ b/Svc/RateGroupDriver/test/ut/RateGroupDriverTester.cpp
@@ -17,9 +17,10 @@ static Fw::SimpleObjRegistry simpleReg;
 
 void connectPorts(Svc::RateGroupDriver& impl, Svc::RateGroupDriverImplTester& tester) {
 
-    impl.set_CycleOut_OutputPort(0,tester.get_from_CycleOut(0));
-    impl.set_CycleOut_OutputPort(1,tester.get_from_CycleOut(1));
-    impl.set_CycleOut_OutputPort(2,tester.get_from_CycleOut(2));
+    for(NATIVE_UINT_TYPE i=0; i<Svc::RateGroupDriver::DIVIDER_SIZE; i++)
+    {
+        impl.set_CycleOut_OutputPort(i,tester.get_from_CycleOut(i));
+    }
 
     tester.connect_to_CycleIn(0,impl.get_CycleIn_InputPort(0));
 #if FW_PORT_TRACING