diff --git a/Sources/Payload/GCI/Baby/hdl/payload_babygci.vhd b/Sources/Payload/GCI/Baby/hdl/payload_babygci.vhd
index 1ce99698d..73d12a2d9 100644
--- a/Sources/Payload/GCI/Baby/hdl/payload_babygci.vhd
+++ b/Sources/Payload/GCI/Baby/hdl/payload_babygci.vhd
@@ -610,8 +610,8 @@ begin
       tip_all_ones_o     => tip_all_ones
       );
 
-  pay2inf_o.testpoints(1) <= '0';
-  pay2inf_o.testpoints(0) <= tip_all_ones;
+  pay2inf_o.testpoints(1) <= r_tp_test1;
+  pay2inf_o.testpoints(0) <= tip_all_ones xor r_tp_test0;
 
 
 
diff --git a/Sources/Payload/GCI/Baby/xml/project/payload_slr0.xml b/Sources/Payload/GCI/Baby/xml/project/payload_slr0.xml
index a29dd7509..ebef6bf49 100644
--- a/Sources/Payload/GCI/Baby/xml/project/payload_slr0.xml
+++ b/Sources/Payload/GCI/Baby/xml/project/payload_slr0.xml
@@ -34,8 +34,8 @@
       <node id="cc_rst"           mask="0x00000010" description="Reset the clk counters"/>
       <node id="bcid_delay"       mask="0x00ff0000" description="GCI BCID delay (wrt LTI-BCID)"/>
 
-      <node id="tp_test0"           mask="0x40000000" description="Signal XORd with testpoint 0 output"/>
-      <node id="tp_test1"           mask="0x80000000" description="Signal XORd with testpoint 1 output"/>
+      <node id="tp_test0_inv"           mask="0x40000000" description="Invert testpoint 0 output"/>
+      <node id="tp_test1_inv"           mask="0x80000000" description="Invert testpoint 1 output"/>
       
     </node>
 
