diff --git a/src/compatibility/cts/setup.jd b/src/compatibility/cts/setup.jd
index 1c9ada2..c486b94 100644
--- a/src/compatibility/cts/setup.jd
+++ b/src/compatibility/cts/setup.jd
@@ -77,13 +77,8 @@
 directory name are correct.</p>
 
 <h3 id=JDK>Java Development Kit (JDK)</h3>
-<p>You need to install the proper version of the <a
-href="{@docRoot}source/initializing.html#installing-the-jdk">Java Development Kit (JDK)</a>:</p>
-
-<ul>
-  <li>CTS 5.0 and later: Java 7
-  <li>CTS 4.4 and earlier: Java 6
-</ul>
+<p>Install the proper version of the Java Development Kit (JDK). See the <a
+href="{@docRoot}source/requirements.html#jdk">JDK requirements</a>.</p>
 
 <h3 id=CTS_files>CTS files</h3>
 
@@ -149,16 +144,16 @@
 <ol>
   <li>Factory data reset the device: <strong>Settings > Backup &amp; reset > Factory data reset</strong>
     <p class="warning"><strong>Warning:</strong> This will erase all user data from the device.</em></p>
-  <li>Set your device’s language to English (<strong>United States</strong>) from: <strong>Settings > Language
+  <li>Set your device's language to English (<strong>United States</strong>) from: <strong>Settings > Language
     & input > Language</strong>
   <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
+    feature on the device: <strong>Settings &gt; Location &gt; On</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 the <a
 href="#physical_environment">Physical Environment</a> section above), and has an
 internet connection: <strong>Settings > Wi-Fi</strong>
-  <li>Make sure no lock pattern or password is set on the device: <strong>Settings > Security > Screen
-    lock = 'None'</strong>
+  <li>Make sure no lock pattern or password is set on the device: <strong>Settings &gt; Security &gt; Screen
+    lock &gt; None</strong>
   <li>Enable <strong>USB debugging</strong> on your device: <strong>Settings &gt; Developer options &gt; USB debugging</strong>.
        <p class="note"><strong>Note:</strong> On Android 4.2 and later, <strong>Developer
         options</strong> is hidden by default. To make them available, go
@@ -167,10 +162,11 @@
         options</strong>. See <a
         href="http://developer.android.com/tools/device.html#developer-device-options">Enabling
         On-device Developer Options</a> for additional details.</p>
-  <li>Select: <strong>Settings > Developer options > Stay Awake</strong>
-  <li>Select: <strong>Settings > Developer options > Allow mock locations</strong>
-<p class="note"><strong>Note:</strong> Starting in Android 6.0, this mock
-locations step is neither available nor required.</p>
+  <li>Select: <strong>Settings &gt; Developer options &gt; Stay Awake &gt; On</strong>
+  <li>Select: <strong>Settings > Developer options > Allow mock locations &gt; On</strong>
+<p class="note"><strong>Note:</strong> This mock locations setting is applicable only in Android 5.x and 4.4.x.</p>
+  <li>Select: <strong>Settings > Developer options > Verify apps over USB > Off</strong>
+<p class="note"><strong>Note:</strong> This verify apps step became required in Android 4.2.</p>
   <li>Launch the browser and dismiss any startup/setup screen.
   <li>Connect the desktop machine that will be used to test the device with a USB cable
     <p class="note"><strong>Note:</strong> When you connect a device running Android 4.2.2 or later