diff --git a/Sming/Arch/Esp32/Tools/ci/build.run.cmd b/Sming/Arch/Esp32/Tools/ci/build.run.cmd
index 78de751535..b1d9c8d08e 100644
--- a/Sming/Arch/Esp32/Tools/ci/build.run.cmd
+++ b/Sming/Arch/Esp32/Tools/ci/build.run.cmd
@@ -1,7 +1,7 @@
 REM Esp32 build.run.cmd
 
 %MAKE_PARALLEL% Basic_Blink Basic_Ethernet Basic_WiFi HttpServer_ConfigNetwork DEBUG_VERBOSE_LEVEL=3 STRICT=1 || goto :error
-%MAKE_PARALLEL% Basic_Ssl ENABLE_SSL=Bearssl DEBUG_VERBOSE_LEVEL=3 STRICT=1 || goto :error
+%MAKE_PARALLEL% Basic_Ssl ENABLE_SSL=Axtls DEBUG_VERBOSE_LEVEL=3 STRICT=1 || goto :error
 
 REM make sure that the Ota Library sample compiles for ESP32
 %MAKE_PARALLEL% -C %SMING_HOME%\Libraries\OtaUpgradeMqtt\samples\Upgrade
diff --git a/Tools/ci/build.cmd b/Tools/ci/build.cmd
index 4efca9ff24..8744dc8fbf 100644
--- a/Tools/ci/build.cmd
+++ b/Tools/ci/build.cmd
@@ -30,8 +30,11 @@ cd /d %SMING_PROJECTS_DIR%/samples/Basic_Blink
 make help
 make list-config
 
+if "%SMING_ARCH%" == "Esp32" set TEST_FLAGS="DISABLE_NETWORK=1"
+
 REM HostTests must build for all architectures
-%MAKE_PARALLEL% -C "%SMING_PROJECTS_DIR%/tests/HostTests" || goto :error
+REM Building Bear SSL library causes memory issues with CI builds in Windows, so avoid for now
+%MAKE_PARALLEL% -C "%SMING_PROJECTS_DIR%/tests/HostTests" %TEST_FLAGS% || goto :error
 
 REM Start Arch-specific tests
 cd /d %SMING_HOME%
diff --git a/tests/HostTests/component.mk b/tests/HostTests/component.mk
index 3fd335e767..17a42e1746 100644
--- a/tests/HostTests/component.mk
+++ b/tests/HostTests/component.mk
@@ -14,12 +14,6 @@ COMPONENT_SRCDIRS := \
 	modules \
 	Arch/$(SMING_ARCH)
 
-ifneq ($(DISABLE_NETWORK),1)
-COMPONENT_SRCDIRS += \
-	modules/Network \
-	modules/Network/Arch/$(SMING_ARCH)
-endif
-
 ARDUINO_LIBRARIES := \
 	SmingTest \
 	ArduinoJson5 \
@@ -30,9 +24,16 @@ ifeq ($(SMING_ARCH),Host)
 endif
 
 COMPONENT_DEPENDS := \
-	malloc_count \
+	malloc_count
+
+ifneq ($(DISABLE_NETWORK),1)
+COMPONENT_SRCDIRS += \
+	modules/Network \
+	modules/Network/Arch/$(SMING_ARCH)
+COMPONENT_DEPENDS += \
 	axtls-8266 \
 	bearssl-esp8266
+endif
 
 ifeq ($(UNAME),Windows)
 # Network tests run on Linux only
diff --git a/tests/HostTests/include/modules.h b/tests/HostTests/include/modules.h
index dd302fb86b..d29f54e112 100644
--- a/tests/HostTests/include/modules.h
+++ b/tests/HostTests/include/modules.h
@@ -25,7 +25,7 @@
 	XX(String)                                                                                                         \
 	XX(ArduinoString)                                                                                                  \
 	XX(Wiring)                                                                                                         \
-	XX(Crypto)                                                                                                         \
+	XX_NET(Crypto)                                                                                                     \
 	XX(CStringArray)                                                                                                   \
 	XX(Stream)                                                                                                         \
 	XX(TemplateStream)                                                                                                 \
diff --git a/tests/HostTests/modules/Crypto.cpp b/tests/HostTests/modules/Network/Crypto.cpp
similarity index 100%
rename from tests/HostTests/modules/Crypto.cpp
rename to tests/HostTests/modules/Network/Crypto.cpp
diff --git a/tests/HostTests/modules/Crypto/AxHash.h b/tests/HostTests/modules/Network/Crypto/AxHash.h
similarity index 100%
rename from tests/HostTests/modules/Crypto/AxHash.h
rename to tests/HostTests/modules/Network/Crypto/AxHash.h
diff --git a/tests/HostTests/modules/Crypto/BrHash.h b/tests/HostTests/modules/Network/Crypto/BrHash.h
similarity index 100%
rename from tests/HostTests/modules/Crypto/BrHash.h
rename to tests/HostTests/modules/Network/Crypto/BrHash.h
diff --git a/tests/HostTests/modules/Crypto/EspHash.h b/tests/HostTests/modules/Network/Crypto/EspHash.h
similarity index 100%
rename from tests/HostTests/modules/Crypto/EspHash.h
rename to tests/HostTests/modules/Network/Crypto/EspHash.h