diff --git a/docs/testing.rst b/docs/testing.rst
index 12f144b9172f1f056ed5b4ae0b98403859d75620..2ac2869e32444d86615f18d7b718f51816a8c078 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -1,8 +1,8 @@
-A testing guide and test reporting form for testers of the OpenAppStack project
-===============================================================================
+Testing guide
+=============
 
-Great that you want to take OpenAppStack for a test drive. This tutorial
-contains instructions to get you going, some pointers on what we think
+Great that you want to take OpenAppStack for a test drive !
+This guide contains instructions to get you going, some pointers on what we think
 would be useful to test, and guesses at what results of those tests
 would be useful to write down. At any point please feel invited to test
 whatever functionality you come across, and reporting whatever you think
@@ -14,8 +14,8 @@ instructions <#providing-feedback>`__.
 During these instructions, please replace *example.org* with your own
 domain name.
 
-Testing OAS installation
-------------------------
+OAS installation
+----------------
 
 First we’d like you to setup an OpenAppStack cluster by yourself,
 following the :ref:`installation:Installation` and :ref:`usage:Usage` documentation and make sure
@@ -28,11 +28,6 @@ Please :ref:`troubleshooting:Run the CLI tests` which checks
 the overall functionality of your cluster and include the output in your
 feedback.
 
-Usability
----------
-
-Please go through the `Usage documentation <./usage.md>`__ and make sure
-you complete all steps.
 
 Testing Instructions for all apps
 ---------------------------------
@@ -49,25 +44,33 @@ Testing Instructions for specific apps
 Nextcloud
 ~~~~~~~~~
 
-Logging into Nextcloud
-^^^^^^^^^^^^^^^^^^^^^^
-
 Please browse to Nextcloud using the link from your user dashboard app
 list and try to log in using single sign-on. Use the button labeled
 ``Login with OpenAppStack``. Please try logging in with your admin
 account and configure the email settings as shown in the Usage doc.
 After that please login with the user you created in the user panel.
 
-Nextcloud client application
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Files & synchronization
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Please try uploading, downloading, moving or copying files.
+
+Calendar
+^^^^^^^^
+
+Please test the basic functionality of the calendar, including advanced features
+like recurrence, custom notifications or inviting attendees.
+
+Passwords
+^^^^^^^^^
+
+Please create and manage different passwords. In addition to that please try
+
+Nextcloud sync applications
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
--  If you like, please try the `Nextcloud desktop
-   client <https://nextcloud.com/clients/>`__, connect it to your
-   OpenAppStack instance, and use it to manage some files.
--  If you like, please try the `Nextcloud mobile
-   client <https://nextcloud.com/clients/>`__ for your smartphone,
-   connect it to your OpenAppStack instance, and use it to download
-   and/or open some files, upload a new file, etc.
+- Please try syncing with your smartphone or desktop using one of the apps
+  mentioned in :ref:`Usage:Nextcloud`.
 
 Onlyoffice
 ~~~~~~~~~~
diff --git a/docs/usage.rst b/docs/usage.rst
index 1d568979c010d20345ec66a1c81d16a7df6e82d6..9e8e3ad4e9e34118303caa8bebec5835d6d74816 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -66,7 +66,49 @@ Nextcloud
 ~~~~~~~~~
 
 `Nextcloud <https://nextcloud.com/>`__ is a file sharing and communication
-platform.
+platform. These Nectcloud apps can be accessed from the top navigation bar:
+
+Files & synchronization
+'''''''''''''''''''''''
+
+You can access your files with the Nextcloud Web interface and create,
+preview, edit, delete, share, and re-share files.
+See the `Files & synchronization user manual
+<https://docs.nextcloud.com/server/latest/user_manual/en/files/index.html>`_ for
+general usage and `Desktop and mobile synchronization
+<https://docs.nextcloud.com/server/latest/user_manual/th/files/desktop_mobile_sync.html>`_
+for setting up file sync on your mobile or dektop device.
+
+Calendar
+''''''''
+
+The Nextcloud Calendar app works similar to other calendar applications you
+can sync your Nextcloud calendars and events with.
+Follow the `Calendar user manual
+<https://docs.nextcloud.com/server/latest/user_manual/en/pim/calendar.html>`_
+for general usage and the
+`Nextcloud groupware docs <https://docs.nextcloud.com/server/latest/user_manual/th/pim/index.html>`
+for syncing your calendars with your mobile or desktop devices.
+
+Passwords
+'''''''''
+
+A simple, yet feature rich password manager for Nextcloud.
+See `Passwors user handbook
+<https://git.mdns.eu/nextcloud/passwords/wikis/users/index>`_
+for more details, including using the `Browser extenstions
+<https://git.mdns.eu/nextcloud/passwords/wikis/Users/Index#browser-extension>`_.
+
+These are the mobile apps that you can use to access your passwords from your
+smartphone:
+
+* [NC passwords app for Android (by joleaf)](https://gitlab.com/joleaf/nc-passwords-app)
+* [Nexcloud password app for Android (by daper)](https://github.com/daper/nextcloud-passwords-app)
+* [Nextcloud passwords for iOS](https://github.com/johannes-schliephake/nextcloud-passwords-ios)
+
+You'll find how to configure file or calendar sync with your smartphone or
+desktop in the `Nextcloud Groupware documentation
+<https://docs.nextcloud.com/server/latest/user_manual/th/pim/index.html>`_.
 
 Onlyoffice
 ~~~~~~~~~~