diff --git a/src/compatibility/cts/setup.jd b/src/compatibility/cts/setup.jd
index 6e13ede..3ebbb9f 100644
--- a/src/compatibility/cts/setup.jd
+++ b/src/compatibility/cts/setup.jd
@@ -24,6 +24,29 @@
   </div>
 </div>
 
+<h2 id=physical_environment>Physical environment</h2>
+<h3 id=wifi>Wi-Fi and IPv6</h3>
+<p>CTS tests require a Wi-Fi network that supports IPv6, can treat the Device
+Under Test (DUT) as an isolated client, and has an internet
+connection. An isolated client refers to a
+configuration where the DUT does not have visibility to the
+broadcast/multinetwork messages on that subnetwork, either by a Wi-Fi AP
+configuration or by running the DUT on an isolated sub-network without
+other devices being connected.</p>
+
+<p>If you don’t have access to a native IPv6 network, an IPv6 carrier network,
+or a VPN to pass some tests depending on IPv6, you may instead use a Wi-Fi
+access point and an IPv6 tunnel. See Wikipedia <a
+href="http://en.wikipedia.org/wiki/List_of_IPv6_tunnel_brokers">list of IPv6
+tunnel brokers</a>.</p>
+
+<h3 id=ble_beacons>Bluetooth LE beacons</h3>
+<p>If the DUT supports the Bluetooth LE feature, then at least three
+Bluetooth LE beacons should be placed within five meters of the DUT for Bluetooth
+LE scan testing. Those beacons can be any kind, do not need to be
+configured or emit anything specific, and can include iBeacon,
+Eddystone, or even devices simulating BLE beacons.</p>
+
 <h2 id=desktop_setup>Desktop machine setup</h2>
 <h3 id=adb>ADB and AAPT</h3>
 <p>Before running the CTS, make sure you have recent versions of both <a
@@ -129,18 +152,9 @@
   <li>Turn on the location setting if there is a GPS or Wi-Fi / Cellular network
     feature on the device: <strong>Settings &gt; Location</strong>
   <li>Connect to a Wi-Fi network  that supports IPv6, can treat the Device
-Under Test (DUT) as an <em>isolated client</em> (see note below), and has an
+Under Test (DUT) as an <em>isolated client</em> (see the <a
+href="physical_environment">Physical Environment</a> section above), and has an
 internet connection: <strong>Settings > Wi-Fi</strong>
-<p class="note"><strong>Tip:</strong> If you don’t have access to a native
-IPv6 network, an IPv6 carrier network,
-or a VPN to pass some tests depending on IPv6, you may instead use a
-Wi-Fi
-      access point and an IPv6 tunnel. See Wikipedia <a href="http://en.wikipedia.org/wiki/List_of_IPv6_tunnel_brokers">list of IPv6 tunnel brokers</a>.</p>
-<p class="note"><strong>Note:</strong> An isolated client refers to a
-configuration where the DUT does not have visibility to the
-broadcast/multinetwork messages on that subnetwork, either by a Wi-Fi AP
-configuration or by running the DUT on an isolated sub-network without
-other devices being connected.</p>
   <li>Make sure no lock pattern or password is set on the device: <strong>Settings > Security > Screen
     lock = 'None'</strong>
   <li>Enable <strong>USB debugging</strong> on your device: <strong>Settings &gt; Developer options &gt; USB debugging</strong>.