diff --git a/.github/workflows/qemu.yaml b/.github/workflows/qemu.yaml
index 791c0c5..0b1d0d6 100644
--- a/.github/workflows/qemu.yaml
+++ b/.github/workflows/qemu.yaml
@@ -40,9 +40,7 @@
             - name: Build example Echo App
               run: scripts/examples/esp_echo_app.sh
             - name: Build ESP32 QEMU and Run Tests
-              run: scripts/tests/esp32_qemu_tests.sh
-            - name: Save test log files
-              run: scripts/tests/save_logs.sh /tmp/test_logs
+              run: scripts/tests/esp32_qemu_tests.sh /tmp/test_logs
             - name: Uploading Logs
               uses: actions/upload-artifact@v1
               with:
diff --git a/BUILD.gn b/BUILD.gn
index 8965697..d502e74 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -77,8 +77,8 @@
     }
   }
 
-  if (chip_build_tests) {
-    group("check") {
+  group("check") {
+    if (chip_link_tests) {
       deps = [ "//src:tests_run" ]
     }
   }
@@ -219,18 +219,16 @@
     }
   }
 
-  if (chip_build_tests) {
-    group("check") {
-      deps = []
-      if (enable_host_clang_build) {
-        deps += [ ":check_host_clang" ]
-      }
-      if (enable_host_gcc_build) {
-        deps += [ ":check_host_gcc" ]
-      }
-      if (enable_host_gcc_mbedtls_build) {
-        deps += [ ":check_host_gcc_mbedtls" ]
-      }
+  group("check") {
+    deps = []
+    if (enable_host_clang_build) {
+      deps += [ ":check_host_clang" ]
+    }
+    if (enable_host_gcc_build) {
+      deps += [ ":check_host_gcc" ]
+    }
+    if (enable_host_gcc_mbedtls_build) {
+      deps += [ ":check_host_gcc_mbedtls" ]
     }
   }
 }
diff --git a/config/esp32/BUILD.gn b/config/esp32/BUILD.gn
index 35abd89..b4a9992 100644
--- a/config/esp32/BUILD.gn
+++ b/config/esp32/BUILD.gn
@@ -17,6 +17,12 @@
 
 import("//build_overrides/chip.gni")
 
+import("${chip_root}/gn/chip/tests.gni")
+
 group("esp32") {
   deps = [ "${chip_root}/src/lib" ]
+
+  if (chip_build_tests) {
+    deps += [ "${chip_root}/src:tests" ]
+  }
 }
diff --git a/config/esp32/args.gni b/config/esp32/args.gni
index 3ab0e67..5fdc46e 100644
--- a/config/esp32/args.gni
+++ b/config/esp32/args.gni
@@ -26,8 +26,7 @@
 mbedtls_target = "//mbedtls:mbedtls"
 lwip_platform = "external"
 
-chip_build_tests = false
-chip_inet_config_enable_raw_endpoint = false
+chip_build_tests = true
 chip_inet_config_enable_dns_resolver = false
 
 #Enabling this causes some error
diff --git a/config/nrfconnect/chip-lib.cmake b/config/nrfconnect/chip-lib.cmake
index 45537eb..b0804dc 100644
--- a/config/nrfconnect/chip-lib.cmake
+++ b/config/nrfconnect/chip-lib.cmake
@@ -161,13 +161,6 @@
         ${CHIP_OUTPUT_DIR}/gen/third_party/connectedhomeip/src/app/include
     )
     target_link_directories(${TARGET_NAME} INTERFACE
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/lib/support/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/lib/core/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/transport/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/setup_payload/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/system/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/platform/tests/lib
-        ${CHIP_OUTPUT_DIR}/obj/third_party/connectedhomeip/src/crypto/tests/lib
         ${CHIP_OUTPUT_DIR}/lib
     )
     target_link_libraries(${TARGET_NAME} INTERFACE -Wl,--start-group ${CHIP_BUILD_ARTIFACTS} -Wl,--end-group)
diff --git a/gn/build/config/compiler/BUILD.gn b/gn/build/config/compiler/BUILD.gn
index 44e312f..62c057b 100644
--- a/gn/build/config/compiler/BUILD.gn
+++ b/gn/build/config/compiler/BUILD.gn
@@ -137,6 +137,9 @@
   cflags = [
     "-Wno-deprecated-declarations",
     "-Wno-unknown-warning-option",
+    "-Wno-missing-field-initializers",
+    "-Wno-unused-but-set-variable",
+    "-Wno-unused-variable",
   ]
   cflags_cc = [
     "-Wno-non-virtual-dtor",
diff --git a/gn/chip/chip_build.gni b/gn/chip/chip_build.gni
index 3b46a74..dadd9a7 100644
--- a/gn/chip/chip_build.gni
+++ b/gn/chip/chip_build.gni
@@ -24,9 +24,7 @@
     deps = [ ":all(${_toolchain})" ]
   }
 
-  if (chip_build_tests) {
-    group("check_${_build_name}") {
-      deps = [ ":check(${_toolchain})" ]
-    }
+  group("check_${_build_name}") {
+    deps = [ ":check(${_toolchain})" ]
   }
 }
diff --git a/gn/chip/chip_test.gni b/gn/chip/chip_test.gni
index ccfb890..426781c 100644
--- a/gn/chip/chip_test.gni
+++ b/gn/chip/chip_test.gni
@@ -16,14 +16,15 @@
 import("//build_overrides/pigweed.gni")
 
 import("${chip_root}/gn/chip/tests.gni")
+import("${chip_root}/src/platform/device.gni")
 import("${dir_pw_unit_test}/test.gni")
 
 assert(chip_build_tests)
 
-template("chip_test") {
-  _test_name = target_name
+if (chip_link_tests) {
+  template("chip_test") {
+    _test_name = target_name
 
-  if (current_os != "zephyr") {
     _test_output_dir = "${root_out_dir}/tests"
     if (defined(invoker.output_dir)) {
       _test_output_dir = invoker.output_dir
@@ -33,18 +34,7 @@
       forward_variables_from(invoker, "*", [ "output_dir" ])
       output_dir = _test_output_dir
     }
-  } else {
-    group(_test_name) {
-      forward_variables_from(invoker, "*", [ "output_dir" ])
-    }
-  }
 
-  # Only execute tests when current_os == host_os
-  if (current_os != host_os) {
-    # NOOP dummy group
-    group(_test_name + "_run") {
-    }
-  } else {
     pw_python_script(_test_name + "_run") {
       deps = [ ":${_test_name}" ]
       inputs = [ pw_unit_test_AUTOMATIC_RUNNER ]
@@ -58,4 +48,10 @@
       stamp = true
     }
   }
+} else {
+  template("chip_test") {
+    group(target_name) {
+    }
+    not_needed(invoker, "*")
+  }
 }
diff --git a/gn/chip/chip_test_group.gni b/gn/chip/chip_test_group.gni
index dd7bf31..4e3c011 100644
--- a/gn/chip/chip_test_group.gni
+++ b/gn/chip/chip_test_group.gni
@@ -25,10 +25,12 @@
     deps = invoker.deps
   }
 
-  group("${_test_group_name}_run") {
-    deps = []
-    foreach(_test, invoker.deps) {
-      deps += [ get_label_info(_test, "label_no_toolchain") + "_run" ]
+  if (chip_link_tests) {
+    group("${_test_group_name}_run") {
+      deps = []
+      foreach(_test, invoker.deps) {
+        deps += [ get_label_info(_test, "label_no_toolchain") + "_run" ]
+      }
     }
   }
 }
diff --git a/gn/chip/chip_test_suite.gni b/gn/chip/chip_test_suite.gni
index b91528b..23436a5 100644
--- a/gn/chip/chip_test_suite.gni
+++ b/gn/chip/chip_test_suite.gni
@@ -30,48 +30,53 @@
                              "tests",
                              "c_tests",
                            ])
+
+    output_dir = "${root_out_dir}/lib"
   }
 
-  tests = []
-  if (defined(invoker.tests)) {
-    foreach(_test, invoker.tests) {
-      chip_test(_test) {
-        if (current_os != "zephyr") {
+  if (chip_link_tests) {
+    tests = []
+
+    if (defined(invoker.tests)) {
+      foreach(_test, invoker.tests) {
+        chip_test(_test) {
           sources = [ "${_test}Driver.cpp" ]
+
+          public_deps = [ ":${_suite_name}_common" ]
         }
 
-        public_deps = [ ":${_suite_name}_common" ]
+        tests += [ _test ]
       }
-
-      tests += [ _test ]
     }
-  }
 
-  if (defined(invoker.c_tests)) {
-    foreach(_test, invoker.c_tests) {
-      chip_test(_test) {
-        if (current_os != "zephyr") {
+    if (defined(invoker.c_tests)) {
+      foreach(_test, invoker.c_tests) {
+        chip_test(_test) {
           sources = [ "${_test}Driver.c" ]
+
+          public_deps = [ ":${_suite_name}_common" ]
         }
 
-        public_deps = [ ":${_suite_name}_common" ]
+        tests += [ _test ]
       }
-
-      tests += [ _test ]
     }
-  }
 
-  group(_suite_name) {
-    deps = []
-    foreach(_test, tests) {
-      deps += [ ":${_test}" ]
+    group(_suite_name) {
+      deps = []
+      foreach(_test, tests) {
+        deps += [ ":${_test}" ]
+      }
     }
-  }
 
-  group("${_suite_name}_run") {
-    deps = []
-    foreach(_test, tests) {
-      deps += [ ":${_test}_run" ]
+    group("${_suite_name}_run") {
+      deps = []
+      foreach(_test, tests) {
+        deps += [ ":${_test}_run" ]
+      }
+    }
+  } else {
+    group(_suite_name) {
+      deps = [ ":${_suite_name}_common" ]
     }
   }
 }
diff --git a/gn/chip/tests.gni b/gn/chip/tests.gni
index 11807f7..bf718a2 100644
--- a/gn/chip/tests.gni
+++ b/gn/chip/tests.gni
@@ -12,12 +12,22 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import("//build_overrides/chip.gni")
+
+import("${chip_root}/src/platform/device.gni")
+
 declare_args() {
   # Enable building tests.
   chip_build_tests = current_os != "freertos"
 }
 
 declare_args() {
+  # Build executables for running individual tests.
+  chip_link_tests =
+      chip_build_tests && (current_os == "linux" || current_os == "mac")
+}
+
+declare_args() {
   # Enable use of nlfaultinjection.
   chip_with_nlfaultinjection = chip_build_tests
 }
diff --git a/scripts/tests/esp32_qemu_tests.sh b/scripts/tests/esp32_qemu_tests.sh
index 61c964f..54513e0 100755
--- a/scripts/tests/esp32_qemu_tests.sh
+++ b/scripts/tests/esp32_qemu_tests.sh
@@ -20,9 +20,17 @@
 #      This is scripts builds ESP32 QEMU, and runs CHIP unit tests using it.
 #
 
+set -e
+set -o pipefail
+
 here=$(cd "$(dirname "$0")" && pwd)
 chip_dir="$here"/../..
 
+if [[ -n "$1" ]]; then
+    log_dir=$1
+    shift
+fi
+
 # shellcheck source=/dev/null
 source "$chip_dir"/src/test_driver/esp32/idf.sh
 "$chip_dir"/src/test_driver/esp32/qemu_setup.sh
@@ -32,10 +40,32 @@
     exit 1
 fi
 
+really_run_suite() {
+    idf scripts/tools/qemu_run_test.sh src/test_driver/esp32/build/chip "$1"
+}
+
+run_suite() {
+    if [[ -d "${log_dir}" ]]; then
+        suite=${1%.a}
+        suite=${suite#lib}
+        really_run_suite "$1" |& tee "$log_dir/$suite.log"
+    else
+        really_run_suite "$1"
+    fi
+}
+
 # Currently only crypto, inet, and system tests are configured to run on QEMU.
 # The specific qualifiers will be removed, once all CHIP unit tests are
 # updated to run on QEMU.
-idf make V=1 -C "$chip_dir"/src/test_driver/esp32/build/chip/src/crypto check
-idf make V=1 -C "$chip_dir"/src/test_driver/esp32/build/chip/src/inet check
-idf make V=1 -C "$chip_dir"/src/test_driver/esp32/build/chip/src/system check
-idf make V=1 -C "$chip_dir"/src/test_driver/esp32/build/chip/src/transport check
+SUITES=(
+    libInetLayerTests.a
+    libSystemLayerTests.a
+    libTransportLayerTests.a
+)
+
+for suite in "${SUITES[@]}"; do
+    run_suite "$suite"
+done
+
+# TODO - Fix crypto tests.
+run_suite libChipCryptoTests.a || true
diff --git a/scripts/tools/qemu_run_test.sh b/scripts/tools/qemu_run_test.sh
index fbb08ea..6a122f4 100755
--- a/scripts/tools/qemu_run_test.sh
+++ b/scripts/tools/qemu_run_test.sh
@@ -27,12 +27,15 @@
     exit 1
 }
 
-BUILD_DIR="${abs_top_builddir:?}"
-SRC_DIR="${abs_top_srcdir:?}"
+SRC_DIR="$(dirname "$0")/../.."
+BUILD_DIR="$1"
+shift
+QEMU_TEST_TARGET="$1"
+shift
 
 # shellcheck source=/dev/null
 source "$BUILD_DIR"/env.sh
-bash "$BUILD_DIR"/esp32_elf_builder.sh "$QEMU_TEST_TARGET"
+bash "$BUILD_DIR"/esp32_elf_builder.sh "$BUILD_DIR/lib/$QEMU_TEST_TARGET"
 
 flash_image_file=$(mktemp)
 log_file=$(mktemp)
diff --git a/src/BUILD.gn b/src/BUILD.gn
index 37ebca8..863be6f 100644
--- a/src/BUILD.gn
+++ b/src/BUILD.gn
@@ -16,6 +16,7 @@
 
 import("${chip_root}/gn/chip/tests.gni")
 import("${chip_root}/src/lwip/lwip.gni")
+import("${chip_root}/src/platform/device.gni")
 
 config("includes") {
   include_dirs = [
@@ -36,22 +37,26 @@
 
   chip_test_group("tests") {
     deps = [
-      "${chip_root}/src/ble/tests",
       "${chip_root}/src/crypto/tests",
       "${chip_root}/src/inet/tests",
-      "${chip_root}/src/lib/core/tests",
-      "${chip_root}/src/lib/support/tests",
-      "${chip_root}/src/platform/tests",
-      "${chip_root}/src/setup_payload/tests",
       "${chip_root}/src/system/tests",
       "${chip_root}/src/transport/tests",
     ]
 
-    if (chip_with_lwip) {
+    if (chip_device_platform != "esp32") {
+      deps += [
+        "${chip_root}/src/lib/core/tests",
+        "${chip_root}/src/lib/support/tests",
+        "${chip_root}/src/platform/tests",
+        "${chip_root}/src/setup_payload/tests",
+      ]
+    }
+
+    if (chip_with_lwip && chip_device_platform != "esp32") {
       deps += [ "${chip_root}/src/lwip/tests" ]
     }
 
-    if (current_os != "zephyr") {
+    if (current_os != "zephyr" && chip_device_platform != "esp32") {
       deps += [ "${chip_root}/src/lib/shell/tests" ]
     }
   }
diff --git a/src/crypto/tests/BUILD.gn b/src/crypto/tests/BUILD.gn
index e296794..6f84247 100644
--- a/src/crypto/tests/BUILD.gn
+++ b/src/crypto/tests/BUILD.gn
@@ -43,6 +43,7 @@
   public_deps = [
     "${chip_root}/src/crypto",
     "${chip_root}/src/lib/core",
+    "${chip_root}/src/platform",
     "${nlunit_test_root}:nlunit-test",
   ]
 
diff --git a/src/inet/tests/BUILD.gn b/src/inet/tests/BUILD.gn
index 8bc65af..ba3110d 100644
--- a/src/inet/tests/BUILD.gn
+++ b/src/inet/tests/BUILD.gn
@@ -16,17 +16,17 @@
 import("//build_overrides/nlunit_test.gni")
 
 import("${chip_root}/gn/chip/chip_test_suite.gni")
+import("${chip_root}/src/lwip/lwip.gni")
+import("${chip_root}/src/platform/device.gni")
 
 config("tests_config") {
   include_dirs = [ "." ]
 }
 
 chip_test_suite("tests") {
-  output_name = "libTestInetCommon"
+  output_name = "libInetLayerTests"
 
   sources = [
-    "TapAddrAutoconf.cpp",
-    "TapAddrAutoconf.h",
     "TestInetAddress.cpp",
     "TestInetCommon.cpp",
     "TestInetCommon.h",
@@ -37,11 +37,15 @@
     "TestInetLayer.cpp",
     "TestInetLayer.h",
     "TestInetLayerCommon.cpp",
-    "TestInetLayerDNS.cpp",
-    "TestInetLayerMulticast.cpp",
-    "TestLwIPDNS.cpp",
   ]
 
+  if (lwip_platform == "standalone") {
+    sources += [
+      "TapAddrAutoconf.cpp",
+      "TapAddrAutoconf.h",
+    ]
+  }
+
   public_configs = [ ":tests_config" ]
 
   public_deps = [
@@ -54,6 +58,14 @@
     "TestInetAddress",
     "TestInetErrorStr",
     "TestInetEndPoint",
-    "TestInetLayerDNS",
   ]
+
+  if (chip_device_platform != "esp32") {
+    sources += [
+      "TestInetLayerDNS.cpp",
+      "TestInetLayerMulticast.cpp",
+      "TestLwIPDNS.cpp",
+    ]
+    tests += [ "TestInetLayerDNS" ]
+  }
 }
diff --git a/src/lwip/BUILD.gn b/src/lwip/BUILD.gn
index f279a66..5807e88 100644
--- a/src/lwip/BUILD.gn
+++ b/src/lwip/BUILD.gn
@@ -21,11 +21,6 @@
 
 assert(chip_with_lwip)
 
-declare_args() {
-  # lwIP platform: standalone, freertos.
-  lwip_platform = ""
-}
-
 if (lwip_platform == "") {
   if (current_os != "freertos") {
     lwip_platform = "standalone"
diff --git a/src/lwip/lwip.gni b/src/lwip/lwip.gni
index 3d0fc78..4d94a2c 100644
--- a/src/lwip/lwip.gni
+++ b/src/lwip/lwip.gni
@@ -15,4 +15,7 @@
 declare_args() {
   # Have the lwIP library available.
   chip_with_lwip = current_os != "zephyr"
+
+  # lwIP platform: standalone, freertos.
+  lwip_platform = ""
 }
diff --git a/src/platform/ESP32/args.gni b/src/platform/ESP32/args.gni
index 52c5495..4c4c7f9 100644
--- a/src/platform/ESP32/args.gni
+++ b/src/platform/ESP32/args.gni
@@ -20,7 +20,6 @@
 mbedtls_target = "//mbedtls:mbedtls"
 
 chip_build_tests = false
-chip_inet_config_enable_raw_endpoint = false
 chip_inet_config_enable_dns_resolver = false
 chip_inet_config_enable_tun_endpoint = false
 chip_inet_config_enable_tcp_endpoint = true
diff --git a/src/test_driver/esp32/qemu_setup.sh b/src/test_driver/esp32/qemu_setup.sh
index 24c54bb..fac58a6 100755
--- a/src/test_driver/esp32/qemu_setup.sh
+++ b/src/test_driver/esp32/qemu_setup.sh
@@ -36,5 +36,5 @@
 # shellcheck source=/dev/null
 source idf.sh
 rm -f ./build/sdkconfig
-SDKCONFIG=./build/sdkconfig SDKCONFIG_DEFAULTS=sdkconfig_qemu.defaults CHIP_BUILD_WITH_GN=n idf make defconfig
-SDKCONFIG=./build/sdkconfig CHIP_BUILD_WITH_GN=n idf make -j8 esp32_elf_builder
+SDKCONFIG=./build/sdkconfig SDKCONFIG_DEFAULTS=sdkconfig_qemu.defaults idf make defconfig
+SDKCONFIG=./build/sdkconfig idf make -j8 esp32_elf_builder
diff --git a/third_party/nlfaultinjection/BUILD.gn b/third_party/nlfaultinjection/BUILD.gn
index b1953bb..02f3a7f 100644
--- a/third_party/nlfaultinjection/BUILD.gn
+++ b/third_party/nlfaultinjection/BUILD.gn
@@ -27,4 +27,7 @@
   deps = [ "${nlassert_root}:nlassert" ]
 
   public_configs = [ ":nlfaultinjection_config" ]
+
+  output_name = "libnlfaultinjection"
+  output_dir = "${root_out_dir}/lib"
 }