diff --git a/tests/suites/test_suite_mpi.data b/tests/suites/test_suite_mpi.data
index 3058a62f5..98a194b0e 100644
--- a/tests/suites/test_suite_mpi.data
+++ b/tests/suites/test_suite_mpi.data
@@ -193,19 +193,19 @@ mbedtls_mpi_lt_mpi_ct:1:"-2":1:"-3":0:0
 Base test mbedtls_mpi_lt_mpi_ct (Negative values) #3
 mbedtls_mpi_lt_mpi_ct:1:"-2":1:"-1":1:0
 
-Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #4
+Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #1
 mbedtls_mpi_lt_mpi_ct:1:"-3":1:"2":1:0
 
-Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #5
+Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #2
 mbedtls_mpi_lt_mpi_ct:1:"2":1:"-3":0:0
 
-Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #6
+Base test mbedtls_mpi_lt_mpi_ct (Mixed values) #3
 mbedtls_mpi_lt_mpi_ct:2:"-2":2:"1C67967269C6":1:0
 
-Base test mbedtls_mpi_lt_mpi_ct (X is longer in storage) #7
+Base test mbedtls_mpi_lt_mpi_ct (X is longer in storage)
 mbedtls_mpi_lt_mpi_ct:3:"2B5":2:"2B5":0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
 
-Base test mbedtls_mpi_lt_mpi_ct (Y is longer in storage) #8
+Base test mbedtls_mpi_lt_mpi_ct (Y is longer in storage)
 mbedtls_mpi_lt_mpi_ct:3:"2B5":4:"2B5":0:MBEDTLS_ERR_MPI_BAD_INPUT_DATA
 
 Base test mbedtls_mpi_lt_mpi_ct (corner case - 64 bit) #1
@@ -238,19 +238,19 @@ mbedtls_mpi_lt_mpi_ct:1:"80000000":1:"0":0:0
 Base test mbedtls_mpi_lt_mpi_ct (corner case - 32 bit) #5
 mbedtls_mpi_lt_mpi_ct:1:"FFFFFFFF":1:"FF":0:0
 
-Multi-limb mbedtls_mpi_lt_mpi_ct (X<Y, zero vs non-zero MS limb) #1
+Multi-limb mbedtls_mpi_lt_mpi_ct (X<Y, zero vs non-zero MS limb)
 mbedtls_mpi_lt_mpi_ct:2:"0FFFFFFFFFFFFFFFF":2:"1FFFFFFFFFFFFFFFF":1:0
 
-Multi-limb mbedtls_mpi_lt_mpi_ct (X<Y, different MS limbs) #2
+Multi-limb mbedtls_mpi_lt_mpi_ct (X<Y, different MS limbs)
 mbedtls_mpi_lt_mpi_ct:2:"-EEFFFFFFFFFFFFFFFF":2:"-EFFFFFFFFFFFFFFFF":1:0
 
-Multi-limb mbedtls_mpi_lt_mpi_ct (X>Y, equal MS limbs) #3
+Multi-limb mbedtls_mpi_lt_mpi_ct (X>Y, equal MS limbs)
 mbedtls_mpi_lt_mpi_ct:2:"-EEFFFFFFFFFFFFFFF1":2:"-EEFFFFFFFFFFFFFFFF":0:0
 
-Multi-limb mbedtls_mpi_lt_mpi_ct (X=Y) #4
+Multi-limb mbedtls_mpi_lt_mpi_ct (X=Y)
 mbedtls_mpi_lt_mpi_ct:2:"EEFFFFFFFFFFFFFFFF":2:"EEFFFFFFFFFFFFFFFF":0:0
 
-Multi-limb mbedtls_mpi_lt_mpi_ct (X=-Y) #4
+Multi-limb mbedtls_mpi_lt_mpi_ct (X=-Y)
 mbedtls_mpi_lt_mpi_ct:2:"-EEFFFFFFFFFFFFFFFF":2:"EEFFFFFFFFFFFFFFFF":1:0
 
 Base test mbedtls_mpi_cmp_abs #1