diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function
index 4e4ee6d54..d87c98e4c 100644
--- a/tests/suites/test_suite_ecdsa.function
+++ b/tests/suites/test_suite_ecdsa.function
@@ -88,18 +88,18 @@ void ecdsa_prim_test_vectors( int id, char *d_str, char *xQ_str, char *yQ_str,
         TEST_ASSERT( mbedtls_mpi_cmp_mpi( &s, &s_check ) == 0 );
 
         TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen, &Q, &r_check, &s_check ) == 0 );
+
+        TEST_ASSERT( mbedtls_mpi_sub_int( &r, &r, 1 ) == 0 );
+        TEST_ASSERT( mbedtls_mpi_add_int( &s, &s, 1 ) == 0 );
+
+        TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
+                     &Q, &r, &s_check ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
+        TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
+                     &Q, &r_check, &s ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
+        TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
+                     &grp.G, &r_check, &s_check ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
     }
 
-    TEST_ASSERT( mbedtls_mpi_sub_int( &r, &r, 1 ) == 0 );
-    TEST_ASSERT( mbedtls_mpi_add_int( &s, &s, 1 ) == 0 );
-
-    TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
-                 &Q, &r, &s_check ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
-    TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
-                 &Q, &r_check, &s ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
-    TEST_ASSERT( mbedtls_ecdsa_verify( &grp, hash, hlen,
-                 &grp.G, &r_check, &s_check ) == MBEDTLS_ERR_ECP_VERIFY_FAILED );
-
 exit:
     mbedtls_ecp_group_free( &grp );
     mbedtls_ecp_point_free( &Q );