diff --git a/proxy_test.go b/proxy_test.go
index 6b35225a..39ee123c 100644
--- a/proxy_test.go
+++ b/proxy_test.go
@@ -1,3 +1,5 @@
+// +build !race
+
 /*
  *
  * Copyright 2017 gRPC authors.
diff --git a/test/end2end_test.go b/test/end2end_test.go
index a9b83ade..e2da08cb 100644
--- a/test/end2end_test.go
+++ b/test/end2end_test.go
@@ -103,7 +103,7 @@ var (
 	})
 )
 
-var raceMode bool // set by race_test.go in race mode
+var raceMode bool // set by race.go in race mode
 
 type testServer struct {
 	security           string // indicate the authentication protocol used by this server.