diff --git a/docs/getting_started/index.rst b/docs/getting_started/index.rst
new file mode 100644
index 0000000..5da6747
--- /dev/null
+++ b/docs/getting_started/index.rst
@@ -0,0 +1,15 @@
+Getting Started
+===============
+
+.. toctree::
+   :maxdepth: 1
+
+   requirements
+
+This document describes how to build the Trusted Firmware-A Tests (TF-A Tests)
+and run them on a set of platforms. It assumes that the reader has previous
+experience building and running the `Trusted Firmware-A (TF-A)`_.
+
+--------------
+
+*Copyright (c) 2019, Arm Limited. All rights reserved.*
diff --git a/docs/getting_started/requirements.rst b/docs/getting_started/requirements.rst
new file mode 100644
index 0000000..3d06d98
--- /dev/null
+++ b/docs/getting_started/requirements.rst
@@ -0,0 +1,42 @@
+Prerequisites & Requirements
+============================
+
+This document describes the software and hardware requiremnts for building TF-A
+Tests for AArch32 and AArch64 target platforms.
+
+It may be possible to build TF-A Tests with combinations of software and
+hardware that are different from those listed below. The software and hardware
+described in this document are officially supported.
+
+Build Host
+----------
+
+TF-A Tests may be built using a Linux build host machine with a recent Linux
+distribution. We have performed tests using Ubuntu 16.04 LTS (64-bit), but other
+distributions should also work fine, provided that the tools and libraries
+can be installed.
+
+Toolchain
+---------
+
+Install the required packages to build TF-A Tests with the following command:
+
+::
+
+    sudo apt-get install device-tree-compiler build-essential make git perl libxml-libxml-perl
+
+Download and install the GNU cross-toolchain from Linaro. The TF-A Tests have
+been tested with version 9.2-2019.12 (gcc 9.2):
+
+-  `GCC cross-toolchain`_
+
+In addition, the following optional packages and tools may be needed:
+
+-   For debugging, Arm `Development Studio 5 (DS-5)`_.
+
+.. _GCC cross-toolchain: https://developer.arm.com/open-source/gnu-toolchain/gnu-a/downloads
+.. _Development Studio 5 (DS-5): https://developer.arm.com/products/software-development-tools/ds-5-development-studio
+
+--------------
+
+*Copyright (c) 2019, Arm Limited. All rights reserved.*
diff --git a/docs/user-guide.rst b/docs/user-guide.rst
index 8f67841..cb696e6 100644
--- a/docs/user-guide.rst
+++ b/docs/user-guide.rst
@@ -1,41 +1,6 @@
 User Guide
 ==========
 
-This document describes how to build the Trusted Firmware-A Tests (TF-A Tests)
-and run them on a set of platforms. It assumes that the reader has previous
-experience building and running the `Trusted Firmware-A (TF-A)`_.
-
-Host machine requirements
--------------------------
-
-The minimum recommended machine specification for building the software and
-running the `FVP models`_ is a dual-core processor running at 2GHz with 12GB of
-RAM. For best performance, use a machine with a quad-core processor running at
-2.6GHz with 16GB of RAM.
-
-The software has been tested on Ubuntu 16.04 LTS (64-bit). Packages used for
-building the software were installed from that distribution unless otherwise
-specified.
-
-Tools
------
-
-Install the required packages to build TF-A Tests with the following command:
-
-::
-
-    sudo apt-get install device-tree-compiler build-essential make git perl libxml-libxml-perl
-
-Download and install the GNU cross-toolchain from developer.arm.com portal. The
-TF-A Tests have been tested with version 9.2-2019.12 (gcc 9.2):
-
--  `AArch32 GNU cross-toolchain`_
--  `AArch64 GNU cross-toolchain`_
-
-In addition, the following optional packages and tools may be needed:
-
--   For debugging, Arm `Development Studio 5 (DS-5)`_.
-
 Getting the TF-A Tests source code
 ----------------------------------
 
@@ -580,13 +545,6 @@
 
 *Copyright (c) 2018-2020, Arm Limited. All rights reserved.*
 
-.. _Development Studio 5 (DS-5): https://developer.arm.com/products/software-development-tools/ds-5-development-studio
-
-.. _FVP models: https://developer.arm.com/products/system-design/fixed-virtual-platforms
-
-.. _AArch32 GNU cross-toolchain: https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-eabi.tar.xz
-.. _AArch64 GNU cross-toolchain: https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf.tar.xz
-
 .. _Linux master tree: https://github.com/torvalds/linux/tree/master/
 
 .. _TF-A: https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/about