diff --git a/redirects/internal.txt b/redirects/internal.txt
index a71a7806d9a0d679a120c9eb0272b057b8301f4b..5dcfe138738a4667660cb0a8b5ad82714a647ed1 100644
--- a/redirects/internal.txt
+++ b/redirects/internal.txt
@@ -5,11 +5,12 @@ best-practices/documentation-style-guide documentation/style-guide
 extensions/basics extensions
 api/general api
 hooks/hook_civicrm_trigger_info hooks/hook_civicrm_triggerInfo
-testing/setup testing/index
+testing/setup testing
 testing/javascript testing/karma
 framework/schema-definition framework/database/schema-definition
 api/params api/options
 testing/selinium testing/selenium
 core/develop tools/git
 basics/filesystem framework/filesystem
-core/architecture framework/codebaseframework/civimail/tokens https://docs.civicrm.org/user/en/latest/common-workflows/tokens-and-mail-merge/
+core/architecture framework/codebase
+framework/civimail/tokens https://docs.civicrm.org/user/en/latest/common-workflows/tokens-and-mail-merge/
diff --git a/redirects/wiki-crm.txt b/redirects/wiki-crm.txt
index 4e4abf230b75c9c36bf43ddb130df91cc5cd32fb..3b5342f5f8108ed3d39a1db42964a9f83417a38a 100644
--- a/redirects/wiki-crm.txt
+++ b/redirects/wiki-crm.txt
@@ -1,5 +1,5 @@
 Documentation+Infrastructure+Canary develop
 Book+style+guide best-practices/documentation-style-guide
-CiviCRM+Unit+Testing+basic+information testing/index
-Writing+a+PHPUnit+testcase+HOWTO testing/index
+CiviCRM+Unit+Testing+basic+information testing
+Writing+a+PHPUnit+testcase+HOWTO testing
 Pull-Request+Process tools/git/#pr
diff --git a/redirects/wiki-crmdoc.txt b/redirects/wiki-crmdoc.txt
index 5279259a3d102e3a78d7639c06dc32705c6bdc6d..e3754517abf8b651025bb52d375857a9b63ea7ce 100644
--- a/redirects/wiki-crmdoc.txt
+++ b/redirects/wiki-crmdoc.txt
@@ -128,7 +128,7 @@ CiviRules+hooks hooks
 Profile+Hooks hooks
 Report+Hooks hooks
 Tests+in+phpstorm tools/phpstorm/#testing
-Testing testing/index
+Testing testing
 PHP+Code+and+Inline+Documentation standards/php
 Upgrade+Reference framework/upgrade
 Bootstrap+Reference framework/bootstrap