diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 032231582ef185889f161b9b2ecc85e904437d7d..e06de5bac4b15b0941e26b567e6390b3447a7e83 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -920,7 +920,8 @@ fn musl_root(&self, target: &str) -> Option<&Path> {
     /// Returns whether the target will be tested using the `remote-test-client`
     /// and `remote-test-server` binaries.
     fn remote_tested(&self, target: &str) -> bool {
-        self.qemu_rootfs(target).is_some() || target.contains("android")
+        self.qemu_rootfs(target).is_some() || target.contains("android") ||
+        env::var_os("TEST_DEVICE_ADDR").is_some()
     }
 
     /// Returns the root of the "rootfs" image that this target will be using,