diff --git a/docs/tests/general/index.rst b/docs/tests/general/index.rst
index 471196f0a..71c80dd1a 100644
--- a/docs/tests/general/index.rst
+++ b/docs/tests/general/index.rst
@@ -10,6 +10,8 @@ Contents
    :includehidden:
    :maxdepth: 3
 
+   instrument_detaching
+
 ..
  add the path to each core feature test case here
  example core/homepage_tests
diff --git a/docs/tests/plugins/debugger/index.rst b/docs/tests/plugins/debugger/index.rst
new file mode 100644
index 000000000..a4c97a215
--- /dev/null
+++ b/docs/tests/plugins/debugger/index.rst
@@ -0,0 +1,14 @@
+.. _tests_debugger:
+
+Debugger Test Cases
+===============================================================================
+
+Contents
+---------------------------------------------------------------------
+
+.. toctree::
+   :includehidden:
+   :maxdepth: 3
+
+   debugger_tests
+   debugger_preferences
diff --git a/docs/tests/plugins/index.rst b/docs/tests/plugins/index.rst
index ffd245d65..95eeb9d17 100644
--- a/docs/tests/plugins/index.rst
+++ b/docs/tests/plugins/index.rst
@@ -10,6 +10,14 @@ Contents
    :includehidden:
    :maxdepth: 3
 
+   debugger/index
+
+   m2k/general_settings_tests
+   m2k/spectrum_analyzer_tests
+   m2k/signal_generator_tests
+   m2k/pattern_generator_tests
+   m2k/voltmeter_tests
+
 ..
  add the path to each plugin test case here
  example dac/dac_tests
diff --git a/docs/tests/plugins/m2k/general_settings.rst b/docs/tests/plugins/m2k/general_settings_tests.rst
similarity index 98%
rename from docs/tests/plugins/m2k/general_settings.rst
rename to docs/tests/plugins/m2k/general_settings_tests.rst
index da86c5a4d..7de5a734b 100644
--- a/docs/tests/plugins/m2k/general_settings.rst
+++ b/docs/tests/plugins/m2k/general_settings_tests.rst
@@ -3,9 +3,7 @@ General Settings - Test Case
 
 Initial Setup
 -----------------------------------------------
-In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool) from the following path on Windows: ``C:\Users\your_username\AppData\Roaming\ADI``.
-
-Open Scopy instrument. The interface should look like the pictures below:
+In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool).
 
 Test Case
 -----------------------------------------------
diff --git a/docs/tests/plugins/m2k/pattern_generator_tests.rst b/docs/tests/plugins/m2k/pattern_generator_tests.rst
index 46c5824af..2129b87dc 100644
--- a/docs/tests/plugins/m2k/pattern_generator_tests.rst
+++ b/docs/tests/plugins/m2k/pattern_generator_tests.rst
@@ -3,7 +3,8 @@ M2K Pattern Generator - Test Suite
 
 Initial Setup
 ----------------------------------------------------------------------------------------------------
-In order to proceed through the test case, first of all delete the Scopy *.ini file (saves previous settings made in Scopy tool) from the following path on Windows: C:\Users\your_username\AppData\Roaming\ADI .
+
+In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool).
 
 Test Case
 ----------------------------------------------------------------------------------------------------
diff --git a/docs/tests/plugins/m2k/signal_generator_tests.rst b/docs/tests/plugins/m2k/signal_generator_tests.rst
index 449193797..0e2b495f6 100644
--- a/docs/tests/plugins/m2k/signal_generator_tests.rst
+++ b/docs/tests/plugins/m2k/signal_generator_tests.rst
@@ -3,7 +3,8 @@ M2K Signal Generator - Test Suite
 
 Initial Setup
 -------------------------------------------------------
-In order to proceed through the test case, first of all delete the Scopy *.ini file (saves previous settings made in Scopy tool) from the following path on Windows: C:\Users\your_username\AppData\Roaming\ADI .
+
+In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool).
 
 Test Case
 -------------------------------------------------------
diff --git a/docs/tests/plugins/m2k/spectrum_analyzer_tests.rst b/docs/tests/plugins/m2k/spectrum_analyzer_tests.rst
index 741be969d..1bc980d50 100644
--- a/docs/tests/plugins/m2k/spectrum_analyzer_tests.rst
+++ b/docs/tests/plugins/m2k/spectrum_analyzer_tests.rst
@@ -3,7 +3,7 @@ M2K Spectrum Analyzer - Test Suite
 
 Initial Setup
 ----------------------------------------------------------------------------------------------------
-In order to proceed through the test case, first of all delete the Scopy *.ini file (saves previous settings made in Scopy tool) from the following path on Windows: C:\Users\your_username\AppData\Roaming\ADI .
+In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool).
 
 Test Case
 ----------------------------------------------------------------------------------------------------
diff --git a/docs/tests/plugins/m2k/voltmeter_tests.rst b/docs/tests/plugins/m2k/voltmeter_tests.rst
index 8e6ab1e0c..8f430e664 100644
--- a/docs/tests/plugins/m2k/voltmeter_tests.rst
+++ b/docs/tests/plugins/m2k/voltmeter_tests.rst
@@ -3,7 +3,7 @@ M2K Voltmeter - Test Suite
 
 Initial Setup
 -------------------------------------------------------------------------------
-In order to proceed through the test case, first of all delete the Scopy *.ini file (saves previous settings made in Scopy tool) from the following path on Windows: C:\Users\your_username\AppData\Roaming\ADI .
+In order to proceed through the test case, first of all delete the Scopy \*.ini file (saves previous settings made in Scopy tool).
 
 Test Case
 -------------------------------------------------------------------------------