diff --git a/.github/workflows/tls_cxx__build.yml b/.github/workflows/tls_cxx__build.yml
new file mode 100644
index 00000000000..46d2bd85c4b
--- /dev/null
+++ b/.github/workflows/tls_cxx__build.yml
@@ -0,0 +1,29 @@
+name: "mqtt-cxx: build-tests"
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, synchronize, reopened, labeled]
+
+jobs:
+  build_tls_cxx:
+    if: contains(github.event.pull_request.labels.*.name, 'tls_cxx') || github.event_name == 'push'
+    name: Build
+    strategy:
+      matrix:
+        idf_ver: ["latest", "release-v5.2", "release-v5.1"]
+        test: [ { app: client, path: "examples/tls_client" }, { app: udp, path: "examples/udp_mutual_auth" }, { app: test, path: "tests/uart_mutual_auth" } ]
+    runs-on: ubuntu-20.04
+    container: espressif/idf:${{ matrix.idf_ver }}
+    steps:
+      - name: Checkout esp-protocols
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - name: Build ${{ matrix.test.app }} with IDF-${{ matrix.idf_ver }}
+        shell: bash
+        run: |
+          . ${IDF_PATH}/export.sh
+          python ./ci/build_apps.py ./components/mbedtls_cxx/${{ matrix.test.app }} -vv --preserve-all
diff --git a/README.md b/README.md
index 918eac47a7e..e3d9c27ef61 100644
--- a/README.md
+++ b/README.md
@@ -53,3 +53,7 @@ Please refer to instructions in [ESP-IDF](https://github.com/espressif/esp-idf)
 ### ESP PPP Link (eppp)
 
 * Brief introduction [README](components/eppp_link/README.md)
+
+### mbedtls_cxx
+
+* Brief introduction [README](components/mbedtls_cxx/README.md)
diff --git a/components/mbedtls_cxx/README.md b/components/mbedtls_cxx/README.md
new file mode 100644
index 00000000000..7dee4d9a775
--- /dev/null
+++ b/components/mbedtls_cxx/README.md
@@ -0,0 +1,3 @@
+# mbedtls_cxx
+
+This is a simplified C++ wrapper of mbedTLS for performing TLS and DTLS handshake a communication. This component allows for overriding low level IO functions (`send()` and `recv()`) and thus supporting TLS over various physical channels.
diff --git a/components/mbedtls_cxx/examples/uart_mutual_auth/CMakeLists.txt b/components/mbedtls_cxx/tests/uart_mutual_auth/CMakeLists.txt
similarity index 100%
rename from components/mbedtls_cxx/examples/uart_mutual_auth/CMakeLists.txt
rename to components/mbedtls_cxx/tests/uart_mutual_auth/CMakeLists.txt
diff --git a/components/mbedtls_cxx/examples/uart_mutual_auth/main/CMakeLists.txt b/components/mbedtls_cxx/tests/uart_mutual_auth/main/CMakeLists.txt
similarity index 100%
rename from components/mbedtls_cxx/examples/uart_mutual_auth/main/CMakeLists.txt
rename to components/mbedtls_cxx/tests/uart_mutual_auth/main/CMakeLists.txt
diff --git a/components/mbedtls_cxx/examples/uart_mutual_auth/main/idf_component.yml b/components/mbedtls_cxx/tests/uart_mutual_auth/main/idf_component.yml
similarity index 100%
rename from components/mbedtls_cxx/examples/uart_mutual_auth/main/idf_component.yml
rename to components/mbedtls_cxx/tests/uart_mutual_auth/main/idf_component.yml
diff --git a/components/mbedtls_cxx/examples/uart_mutual_auth/main/uart_mutual.cpp b/components/mbedtls_cxx/tests/uart_mutual_auth/main/uart_mutual.cpp
similarity index 100%
rename from components/mbedtls_cxx/examples/uart_mutual_auth/main/uart_mutual.cpp
rename to components/mbedtls_cxx/tests/uart_mutual_auth/main/uart_mutual.cpp
diff --git a/components/mbedtls_cxx/examples/uart_mutual_auth/sdkconfig.defaults b/components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults
similarity index 100%
rename from components/mbedtls_cxx/examples/uart_mutual_auth/sdkconfig.defaults
rename to components/mbedtls_cxx/tests/uart_mutual_auth/sdkconfig.defaults