Index: test/tsan/dlclose.cc
===================================================================
--- test/tsan/dlclose.cc
+++ test/tsan/dlclose.cc
@@ -4,7 +4,7 @@
 // If we mention TSAN_OPTIONS, the test won't run from test_output.sh script.
 
 // Test case for
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=80
+// https://github.com/google/sanitizers/issues/487
 
 #ifdef BUILD_SO
 
Index: test/tsan/getline_nohang.cc
===================================================================
--- test/tsan/getline_nohang.cc
+++ test/tsan/getline_nohang.cc
@@ -1,7 +1,7 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %run %t
 
 // Make sure TSan doesn't deadlock on a file stream lock at program shutdown.
-// See https://code.google.com/p/thread-sanitizer/issues/detail?id=47
+// See https://github.com/google/sanitizers/issues/454
 #ifdef __FreeBSD__
 #define _WITH_GETLINE  // to declare getline()
 #endif
Index: test/tsan/map32bit.cc
===================================================================
--- test/tsan/map32bit.cc
+++ test/tsan/map32bit.cc
@@ -5,7 +5,7 @@
 #include <sys/mman.h>
 
 // Test for issue:
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=5
+// https://github.com/google/sanitizers/issues/412
 
 // MAP_32BIT flag for mmap is supported only for x86_64.
 // XFAIL: mips64
Index: test/tsan/pthread_atfork_deadlock.c
===================================================================
--- test/tsan/pthread_atfork_deadlock.c
+++ test/tsan/pthread_atfork_deadlock.c
@@ -1,6 +1,6 @@
 // RUN: %clang_tsan -O1 %s -lpthread -o %t && %deflake %run %t | FileCheck %s
 // Regression test for
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=61
+// https://github.com/google/sanitizers/issues/468
 // When the data race was reported, pthread_atfork() handler used to be
 // executed which caused another race report in the same thread, which resulted
 // in a deadlock.
Index: test/tsan/race_on_speculative_load.cc
===================================================================
--- test/tsan/race_on_speculative_load.cc
+++ test/tsan/race_on_speculative_load.cc
@@ -1,5 +1,5 @@
 // RUN: %clangxx_tsan -O1 %s -o %t && %run %t | FileCheck %s
-// Regtest for https://code.google.com/p/thread-sanitizer/issues/detail?id=40
+// Regtest for https://github.com/google/sanitizers/issues/447
 // This is a correct program and tsan should not report a race.
 #include "test.h"
 
Index: test/tsan/signal_cond.cc
===================================================================
--- test/tsan/signal_cond.cc
+++ test/tsan/signal_cond.cc
@@ -6,7 +6,7 @@
 #include <semaphore.h>
 
 // Test that signals can be delivered to blocked pthread_cond_wait.
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=91
+// https://github.com/google/sanitizers/issues/498
 
 int g_thread_run = 1;
 pthread_mutex_t mutex;
Index: test/tsan/signal_longjmp.cc
===================================================================
--- test/tsan/signal_longjmp.cc
+++ test/tsan/signal_longjmp.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Test case for longjumping out of signal handler:
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=75
+// https://github.com/google/sanitizers/issues/482
 
 // Longjmp assembly has not been implemented for mips64 yet
 // XFAIL: mips64
Index: test/tsan/signal_recursive.cc
===================================================================
--- test/tsan/signal_recursive.cc
+++ test/tsan/signal_recursive.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 
 // Test case for recursive signal handlers, adopted from:
-// https://code.google.com/p/thread-sanitizer/issues/detail?id=71
+// https://github.com/google/sanitizers/issues/478
 
 // REQUIRES: disabled
 
Index: test/tsan/stack_sync_reuse.cc
===================================================================
--- test/tsan/stack_sync_reuse.cc
+++ test/tsan/stack_sync_reuse.cc
@@ -1,7 +1,7 @@
 // RUN: %clang_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
 #include "test.h"
 
-// Test case https://code.google.com/p/thread-sanitizer/issues/detail?id=87
+// Test case https://github.com/google/sanitizers/issues/494
 // Tsan sees false HB edge on address pointed to by syncp variable.
 // It is false because when acquire is done syncp points to a var in one frame,
 // and during release it points to a var in a different frame.
Index: test/tsan/virtual_inheritance_compile_bug.cc
===================================================================
--- test/tsan/virtual_inheritance_compile_bug.cc
+++ test/tsan/virtual_inheritance_compile_bug.cc
@@ -1,4 +1,4 @@
-// Regression test for http://code.google.com/p/thread-sanitizer/issues/detail?id=3.
+// Regression test for https://github.com/google/sanitizers/issues/410.
 // The C++ variant is much more compact that the LLVM IR equivalent.
 
 // RUN: %clangxx_tsan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s