diff --git a/client/emv/test/cryptotest.c b/client/emv/test/cryptotest.c
index 84ed4f2b..8f6bcfe6 100644
--- a/client/emv/test/cryptotest.c
+++ b/client/emv/test/cryptotest.c
@@ -36,10 +36,6 @@ int ExecuteCryptoTests(bool verbose) {
 	int res;
 	bool TestFail = false;
 	
-	res = ecdsa_nist_test(verbose);
-	if (res) TestFail = true;
-return 0;
-	
 	res = mbedtls_mpi_self_test(verbose);
 	if (res) TestFail = true;
 	
@@ -73,6 +69,9 @@ return 0;
 	res = mbedtls_cmac_self_test(verbose);
 	if (res) TestFail = true;
 
+	res = ecdsa_nist_test(verbose);
+	if (res) TestFail = true;
+
 	res = mbedtls_ecp_self_test(verbose);
 	if (res) TestFail = true;