diff --git a/sys/fido2/doc.txt b/sys/fido2/doc.txt
index 94e0aac96b..6c0c745a39 100644
--- a/sys/fido2/doc.txt
+++ b/sys/fido2/doc.txt
@@ -197,7 +197,7 @@
  *
  * Testing is done with the help of the fido2-tests package based on the [solokeys fido2-tests](https://github.com/solokeys/fido2-tests).
  *
- * For for more information about testing the FIDO2 CTAP implementation refer to the README of the test application (`/tests/sys_fido2_ctap`).
+ * For for more information about testing the FIDO2 CTAP implementation refer to the README of the test application (`/tests/sys/fido2_ctap`).
  *
  * **Todo**
  *
diff --git a/sys/include/frac.h b/sys/include/frac.h
index 6ab98f754c..2c20318422 100644
--- a/sys/include/frac.h
+++ b/sys/include/frac.h
@@ -18,7 +18,7 @@
  * runtime, or via a precomputed initializer.
  *
  * Precomputing the frac_t values can be done via the application found in
- * `tests/frac-config` in the RIOT tree.
+ * `tests/sys/frac-config` in the RIOT tree.
  *
  * ### Numeric precision
  *
diff --git a/sys/include/puf_sram.h b/sys/include/puf_sram.h
index 4c98dcd6ff..1c5cbdb549 100644
--- a/sys/include/puf_sram.h
+++ b/sys/include/puf_sram.h
@@ -30,7 +30,7 @@
  * even before kernel initialization.
  * Memory properties are hardware specific and can depend on environmental conditions.
  * Thus, they should be evaluated for each individual deployment. A basic
- * testing tool is provided in /RIOT/tests/puf_sram.
+ * testing tool is provided in /RIOT/tests/sys/puf_sram.
  *
  * # Soft-reset detection
  *
diff --git a/sys/shell/cmds/gnrc_ipv6_nib.c b/sys/shell/cmds/gnrc_ipv6_nib.c
index d271fa86ef..e6b7c51612 100644
--- a/sys/shell/cmds/gnrc_ipv6_nib.c
+++ b/sys/shell/cmds/gnrc_ipv6_nib.c
@@ -30,7 +30,7 @@ static int _nib_route(int argc, char **argv);
 static int _nib_abr(int argc, char **argv);
 #endif  /* CONFIG_GNRC_IPV6_NIB_MULTIHOP_P6C */
 
-/* TODO: updated tests/gnrc_dhcpv6_client to no longer abuse this shell command
+/* TODO: updated tests/net/gnrc_dhcpv6_client to no longer abuse this shell command
  * and add static qualifier */
 int _gnrc_ipv6_nib(int argc, char **argv)
 {
diff --git a/sys/shell/cmds/gnrc_netif.c b/sys/shell/cmds/gnrc_netif.c
index 35d7a7b1c9..86ea8d4740 100644
--- a/sys/shell/cmds/gnrc_netif.c
+++ b/sys/shell/cmds/gnrc_netif.c
@@ -1853,7 +1853,7 @@ static int _gnrc_netif_send(int argc, char **argv)
 SHELL_COMMAND(txtsnd, "Sends a custom string as is over the link layer", _gnrc_netif_send);
 #endif
 
-/* TODO: updated tests/gnrc_dhcpv6_client to no longer abuse this shell command
+/* TODO: updated tests/net/gnrc_dhcpv6_client to no longer abuse this shell command
  * and add static qualifier */
 int _gnrc_netif_config(int argc, char **argv)
 {