diff --git a/tests/BUILD.bazel b/tests/BUILD.bazel
index a96577eb8..bd857bfd2 100644
--- a/tests/BUILD.bazel
+++ b/tests/BUILD.bazel
@@ -132,7 +132,7 @@ java_binary(
     deps = ["//src/main/java/com/code_intelligence/jazzer/api:hooks"],
 )
 
-# Regression test for https://github.com/CodeIntelligence/jazzer/issues/878:
+# Regression test for https://github.com/CodeIntelligenceTesting/jazzer/issues/878:
 # Custom hooks must be disabled during coverage report generation to prevent
 # NoClassDefFoundError when hooked classes are used and the hook class is no
 # longer available.
diff --git a/tests/src/test/java/com/example/CoverageWithHooksFuzzer.java b/tests/src/test/java/com/example/CoverageWithHooksFuzzer.java
index 7fd107dc8..ad335afb9 100644
--- a/tests/src/test/java/com/example/CoverageWithHooksFuzzer.java
+++ b/tests/src/test/java/com/example/CoverageWithHooksFuzzer.java
@@ -20,7 +20,7 @@
 import java.util.ArrayList;
 
 /**
- * Regression test for https://github.com/CodeIntelligence/jazzer/issues/878.
+ * Regression test for https://github.com/CodeIntelligenceTesting/jazzer/issues/878.
  *
  * <p>When generating a coverage report at shutdown, any use of hooked method would trigger custom
  * hook dispatch. If the hook class is no longer loadable at that point, the JVM throws
diff --git a/tests/src/test/java/com/example/CoverageWithHooksFuzzerHooks.java b/tests/src/test/java/com/example/CoverageWithHooksFuzzerHooks.java
index 30bfe4e7f..b17e35095 100644
--- a/tests/src/test/java/com/example/CoverageWithHooksFuzzerHooks.java
+++ b/tests/src/test/java/com/example/CoverageWithHooksFuzzerHooks.java
@@ -21,8 +21,8 @@
 import java.lang.invoke.MethodHandle;
 
 /**
- * Hook that targets ArrayList.&lt;init&gt; that sets a system property so that we can check in the
- * fuzz test whether the hook is called or not.
+ * Hook that targets {@code ArrayList.<init>} that sets a system property so that we can check in
+ * the fuzz test whether the hook is called or not.
  */
 public class CoverageWithHooksFuzzerHooks {
   @MethodHook(