diff --git a/compiler/noirc_frontend/src/ast/traits.rs b/compiler/noirc_frontend/src/ast/traits.rs
index 6f4ddcef9a3..b370d7356e6 100644
--- a/compiler/noirc_frontend/src/ast/traits.rs
+++ b/compiler/noirc_frontend/src/ast/traits.rs
@@ -136,6 +136,7 @@ impl Display for TypeImpl {
     }
 }
 
+// TODO(https://github.com/noir-lang/noir/issues/8306): display where clauses
 impl Display for NoirTrait {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let generics = vecmap(&self.generics, |generic| generic.to_string());
diff --git a/tooling/debugger/build.rs b/tooling/debugger/build.rs
index 84ac61015c7..2c29bf48c8e 100644
--- a/tooling/debugger/build.rs
+++ b/tooling/debugger/build.rs
@@ -27,7 +27,7 @@ fn main() -> Result<(), String> {
     // Rebuild if the tests have changed
     println!("cargo:rerun-if-changed=tests");
     println!("cargo:rerun-if-changed=ignored-tests.txt");
-    // TODO: Running the tests changes the timestamps on test_programs files (file lock?).
+    // TODO(https://github.com/noir-lang/noir/issues/8351): Running the tests changes the timestamps on test_programs files (file lock?).
     // That has the knock-on effect of then needing to rebuild the tests after running the tests.
     println!("cargo:rerun-if-changed={}", test_dir.as_os_str().to_str().unwrap());
 
@@ -107,7 +107,7 @@ fn generate_test_runner_debugger_tests(test_file: &mut File, test_data_dir: &Pat
             .flatten()
             .collect();
         for test_name_line in test_names {
-            // TODO: get test name by regex perhaps?
+            // TODO(https://github.com/noir-lang/noir/issues/8352): get test name by regex perhaps?
             let test_name = test_name_line
                 .split("fn ")
                 .collect::<Vec<&str>>()
diff --git a/tooling/nargo_cli/build.rs b/tooling/nargo_cli/build.rs
index a94d1bcd7db..773a9235048 100644
--- a/tooling/nargo_cli/build.rs
+++ b/tooling/nargo_cli/build.rs
@@ -27,8 +27,6 @@ fn main() -> Result<(), String> {
 
     // Rebuild if the tests have changed
     println!("cargo:rerun-if-changed=tests");
-    // TODO: Running the tests changes the timestamps on test_programs files (file lock?).
-    // That has the knock-on effect of then needing to rebuild the tests after running the tests.
     println!("cargo:rerun-if-changed={}", test_dir.as_os_str().to_str().unwrap());
 
     generate_execution_success_tests(&mut test_file, &test_dir);