diff --git a/Android.mk b/Android.mk
index 06ead54..415113e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -43,6 +43,7 @@
 	regression_6000.c \
 	regression_7000.c \
 	regression_8000.c \
+	regression_8100.c \
 	sha_perf.c \
 	xtest_helpers.c \
 	xtest_main.c \
diff --git a/host/xtest/CMakeLists.txt b/host/xtest/CMakeLists.txt
index dbecb7a..b307d07 100644
--- a/host/xtest/CMakeLists.txt
+++ b/host/xtest/CMakeLists.txt
@@ -28,6 +28,7 @@
 	regression_6000.c
 	regression_7000.c
 	regression_8000.c
+	regression_8100.c
 	sha_perf.c
 	xtest_helpers.c
 	xtest_main.c
diff --git a/host/xtest/Makefile b/host/xtest/Makefile
index d094691..d25fcb6 100644
--- a/host/xtest/Makefile
+++ b/host/xtest/Makefile
@@ -46,6 +46,7 @@
 	regression_6000.c \
 	regression_7000.c \
 	regression_8000.c \
+	regression_8100.c \
 	sha_perf.c \
 	xtest_helpers.c \
 	xtest_main.c \
diff --git a/host/xtest/regression_8100.c b/host/xtest/regression_8100.c
new file mode 100644
index 0000000..001f037
--- /dev/null
+++ b/host/xtest/regression_8100.c
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2018, Linaro Limited */
+
+#include "xtest_test.h"
+#include "xtest_helpers.h"
+
+#include <ta_crypt.h>
+#include <tee_api_types.h>
+#include <compiler.h>
+
+static void test_8101(ADBG_Case_t *c __maybe_unused)
+{
+#ifdef CFG_TA_MBEDTLS_SELF_TEST
+	TEEC_Session session = { 0 };
+	uint32_t ret_orig;
+
+	if (!ADBG_EXPECT_TEEC_SUCCESS(c, xtest_teec_open_session(
+					      &session, &crypt_user_ta_uuid,
+					      NULL, &ret_orig)))
+		return;
+	ADBG_EXPECT_TEEC_SUCCESS(c,
+		TEEC_InvokeCommand(&session, TA_CRYPT_CMD_MBEDTLS_SELF_TESTS,
+				   NULL, &ret_orig));
+	TEEC_CloseSession(&session);
+#else
+	Do_ADBG_Log("CFG_TA_MBEDTLS_SELF_TEST not set, test skipped");
+#endif
+}
+ADBG_CASE_DEFINE(regression, 8101, test_8101, "TA mbedTLS self tests");