diff --git a/.github/workflows/hil.yml b/.github/workflows/hil.yml
index 50c9d881bd6..10c937f1bfe 100644
--- a/.github/workflows/hil.yml
+++ b/.github/workflows/hil.yml
@@ -66,19 +66,12 @@ jobs:
   Test:
     needs: [gen_chunks, Build]
     name: ${{matrix.chip}}-Test#${{matrix.chunks}}
-    runs-on:
-      - ESP32
-      - ESP32-S2
-      - ESP32-S3
-      - ESP32-C3
-      - ESP32-C6
-      - ESP32-H2
-
     strategy:
       fail-fast: false
       matrix:
         chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3', 'esp32c6', 'esp32h2']
         chunks: ${{fromJson(needs.gen_chunks.outputs.chunks)}}
+    runs-on: [arduino, "${{matrix.chip}}"]
     container:
       image: python:3.10.1-bullseye
       options: --privileged
diff --git a/tests/democfg/cfg.json b/tests/democfg/cfg.json
index 2b9f26bf1fe..e39e709ecca 100644
--- a/tests/democfg/cfg.json
+++ b/tests/democfg/cfg.json
@@ -19,6 +19,14 @@
     {
       "name": "esp32s3",
       "fqbn": ["espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app"]
+    },
+    {
+      "name": "esp32c6",
+      "fqbn": ["espressif:esp32:esp32c6:PartitionScheme=huge_app"]
+    },
+    {
+      "name": "esp32h2",
+      "fqbn": ["espressif:esp32:esp32h2:PartitionScheme=huge_app"]
     }
   ]
 }
diff --git a/tests/nvs/cfg.json b/tests/nvs/cfg.json
index c1b23d46842..a6be9540aa8 100644
--- a/tests/nvs/cfg.json
+++ b/tests/nvs/cfg.json
@@ -34,6 +34,24 @@
         "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=qio120",
         "espressif:esp32:esp32s3:PSRAM=opi,USBMode=default,PartitionScheme=huge_app,FlashMode=dio"
       ]
+    },
+    {
+      "name": "esp32c6",
+      "fqbn": [
+        "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=40",
+        "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32c6:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=40"
+      ]
+    },
+    {
+      "name": "esp32h2",
+      "fqbn": [
+        "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio",
+        "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=dio,FlashFreq=16",
+        "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio",
+        "espressif:esp32:esp32h2:PartitionScheme=huge_app,FlashMode=qio,FlashFreq=16"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/requirements.txt b/tests/requirements.txt
index aa2f8e94477..896699b5752 100644
--- a/tests/requirements.txt
+++ b/tests/requirements.txt
@@ -1,3 +1,5 @@
+cryptography>=2.1.4
+--only-binary cryptography
 pytest-cov
 pytest-embedded-serial-esp>=1.3.4
 pytest-embedded-arduino>=1.3.4