diff --git a/client/emv/cryptotest.c b/client/emv/cryptotest.c
new file mode 100644
index 00000000..a298a3d0
--- /dev/null
+++ b/client/emv/cryptotest.c
@@ -0,0 +1,53 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2017 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Crypto algorithms testing
+//-----------------------------------------------------------------------------
+
+#include "cryptotest.h"
+#include "util.h"
+
+#include "sda_test.h"
+#include "bignum.h"
+#include "aes.h"
+#include "des.h"
+#include "rsa.h"
+#include "sha1.h"
+
+
+int ExecuteCryptoTests() {
+	int res;
+	bool TestFail = false;
+	
+	res = mpi_self_test(true);
+	if (res) TestFail = true;
+	
+	res = aes_self_test(true);
+	if (res) TestFail = true;
+	
+	res = des_self_test(true);
+	if (res) TestFail = true;
+	
+	res = sha1_self_test(true);
+	if (res) TestFail = true;
+	
+	res = rsa_self_test(true);
+	if (res) TestFail = true;
+	
+	res = exec_sda_test();
+	if (res) TestFail = true;
+	
+	PrintAndLog("--------------------------");
+	
+	if (TestFail)
+		PrintAndLog("Test(s) [ERROR].");
+	else
+		PrintAndLog("Tests [OK].");
+	
+	return TestFail;
+}
+
diff --git a/client/emv/cryptotest.h b/client/emv/cryptotest.h
new file mode 100644
index 00000000..d2c9acd0
--- /dev/null
+++ b/client/emv/cryptotest.h
@@ -0,0 +1,13 @@
+//-----------------------------------------------------------------------------
+// Copyright (C) 2017 Merlok
+//
+// This code is licensed to you under the terms of the GNU GPL, version 2 or,
+// at your option, any later version. See the LICENSE.txt file for the text of
+// the license.
+//-----------------------------------------------------------------------------
+// Crypto algorithms testing
+//-----------------------------------------------------------------------------
+
+#include <stdbool.h>
+
+extern int ExecuteCryptoTests();