diff --git a/src/platform/silabs/efr32test/BLEManagerImpl.cpp b/src/platform/silabs/efr32/BLEManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/BLEManagerImpl.cpp
rename to src/platform/silabs/efr32/BLEManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/BUILD.gn b/src/platform/silabs/efr32/BUILD.gn
similarity index 100%
rename from src/platform/silabs/efr32test/BUILD.gn
rename to src/platform/silabs/efr32/BUILD.gn
diff --git a/src/platform/silabs/efr32test/CHIPCryptoPALPsaEfr32.cpp b/src/platform/silabs/efr32/CHIPCryptoPALPsaEfr32.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/CHIPCryptoPALPsaEfr32.cpp
rename to src/platform/silabs/efr32/CHIPCryptoPALPsaEfr32.cpp
diff --git a/src/platform/silabs/efr32test/ConfigurationManagerImpl.cpp b/src/platform/silabs/efr32/ConfigurationManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/ConfigurationManagerImpl.cpp
rename to src/platform/silabs/efr32/ConfigurationManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/ConnectivityManagerImpl.cpp b/src/platform/silabs/efr32/ConnectivityManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/ConnectivityManagerImpl.cpp
rename to src/platform/silabs/efr32/ConnectivityManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/Efr32OpaqueKeypair.h b/src/platform/silabs/efr32/Efr32OpaqueKeypair.h
similarity index 100%
rename from src/platform/silabs/efr32test/Efr32OpaqueKeypair.h
rename to src/platform/silabs/efr32/Efr32OpaqueKeypair.h
diff --git a/src/platform/silabs/efr32test/Efr32PsaOpaqueKeypair.cpp b/src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/Efr32PsaOpaqueKeypair.cpp
rename to src/platform/silabs/efr32/Efr32PsaOpaqueKeypair.cpp
diff --git a/src/platform/silabs/efr32test/Efr32PsaOperationalKeystore.cpp b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/Efr32PsaOperationalKeystore.cpp
rename to src/platform/silabs/efr32/Efr32PsaOperationalKeystore.cpp
diff --git a/src/platform/silabs/efr32test/Efr32PsaOperationalKeystore.h b/src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h
similarity index 100%
rename from src/platform/silabs/efr32test/Efr32PsaOperationalKeystore.h
rename to src/platform/silabs/efr32/Efr32PsaOperationalKeystore.h
diff --git a/src/platform/silabs/efr32test/KeyValueStoreManagerImpl.cpp b/src/platform/silabs/efr32/KeyValueStoreManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/KeyValueStoreManagerImpl.cpp
rename to src/platform/silabs/efr32/KeyValueStoreManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/OTAImageProcessorImpl.cpp b/src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/OTAImageProcessorImpl.cpp
rename to src/platform/silabs/efr32/OTAImageProcessorImpl.cpp
diff --git a/src/platform/silabs/efr32test/OTAImageProcessorImpl.h b/src/platform/silabs/efr32/OTAImageProcessorImpl.h
similarity index 100%
rename from src/platform/silabs/efr32test/OTAImageProcessorImpl.h
rename to src/platform/silabs/efr32/OTAImageProcessorImpl.h
diff --git a/src/platform/silabs/efr32test/PlatformManagerImpl.cpp b/src/platform/silabs/efr32/PlatformManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/PlatformManagerImpl.cpp
rename to src/platform/silabs/efr32/PlatformManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/ThreadStackManagerImpl.cpp b/src/platform/silabs/efr32/ThreadStackManagerImpl.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/ThreadStackManagerImpl.cpp
rename to src/platform/silabs/efr32/ThreadStackManagerImpl.cpp
diff --git a/src/platform/silabs/efr32test/args.gni b/src/platform/silabs/efr32/args.gni
similarity index 100%
rename from src/platform/silabs/efr32test/args.gni
rename to src/platform/silabs/efr32/args.gni
diff --git a/src/platform/silabs/efr32test/efr32-chip-mbedtls-config.h b/src/platform/silabs/efr32/efr32-chip-mbedtls-config.h
similarity index 100%
rename from src/platform/silabs/efr32test/efr32-chip-mbedtls-config.h
rename to src/platform/silabs/efr32/efr32-chip-mbedtls-config.h
diff --git a/src/platform/silabs/efr32test/psa_crypto_config.h b/src/platform/silabs/efr32/psa_crypto_config.h
similarity index 100%
rename from src/platform/silabs/efr32test/psa_crypto_config.h
rename to src/platform/silabs/efr32/psa_crypto_config.h
diff --git a/src/platform/silabs/efr32test/wifi/dhcp_client.cpp b/src/platform/silabs/efr32/wifi/dhcp_client.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/dhcp_client.cpp
rename to src/platform/silabs/efr32/wifi/dhcp_client.cpp
diff --git a/src/platform/silabs/efr32test/wifi/dhcp_client.h b/src/platform/silabs/efr32/wifi/dhcp_client.h
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/dhcp_client.h
rename to src/platform/silabs/efr32/wifi/dhcp_client.h
diff --git a/src/platform/silabs/efr32test/wifi/ethernetif.cpp b/src/platform/silabs/efr32/wifi/ethernetif.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/ethernetif.cpp
rename to src/platform/silabs/efr32/wifi/ethernetif.cpp
diff --git a/src/platform/silabs/efr32test/wifi/ethernetif.h b/src/platform/silabs/efr32/wifi/ethernetif.h
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/ethernetif.h
rename to src/platform/silabs/efr32/wifi/ethernetif.h
diff --git a/src/platform/silabs/efr32test/wifi/lwip_netif.cpp b/src/platform/silabs/efr32/wifi/lwip_netif.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/lwip_netif.cpp
rename to src/platform/silabs/efr32/wifi/lwip_netif.cpp
diff --git a/src/platform/silabs/efr32test/wifi/wfx_host_events.h b/src/platform/silabs/efr32/wifi/wfx_host_events.h
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/wfx_host_events.h
rename to src/platform/silabs/efr32/wifi/wfx_host_events.h
diff --git a/src/platform/silabs/efr32test/wifi/wfx_msgs.h b/src/platform/silabs/efr32/wifi/wfx_msgs.h
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/wfx_msgs.h
rename to src/platform/silabs/efr32/wifi/wfx_msgs.h
diff --git a/src/platform/silabs/efr32test/wifi/wfx_notify.cpp b/src/platform/silabs/efr32/wifi/wfx_notify.cpp
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/wfx_notify.cpp
rename to src/platform/silabs/efr32/wifi/wfx_notify.cpp
diff --git a/src/platform/silabs/efr32test/wifi/wifi_config.h b/src/platform/silabs/efr32/wifi/wifi_config.h
similarity index 100%
rename from src/platform/silabs/efr32test/wifi/wifi_config.h
rename to src/platform/silabs/efr32/wifi/wifi_config.h
diff --git a/src/platform/silabs/efr32test/wifi_args.gni b/src/platform/silabs/efr32/wifi_args.gni
similarity index 100%
rename from src/platform/silabs/efr32test/wifi_args.gni
rename to src/platform/silabs/efr32/wifi_args.gni