diff --git a/src/testing/match.go b/src/testing/match.go
index 84804dc2ecf..93eb4fa8ae1 100644
--- a/src/testing/match.go
+++ b/src/testing/match.go
@@ -44,10 +44,6 @@ type simpleMatch []string
 // alternationMatch matches a test name if one of the alternations match.
 type alternationMatch []filterMatch
 
-// TODO: fix test_main to avoid race and improve caching, also allowing to
-// eliminate this Mutex.
-var matchMutex sync.Mutex
-
 func allMatcher() *matcher {
 	return newMatcher(nil, "", "", "")
 }
@@ -90,9 +86,6 @@ func (m *matcher) fullName(c *common, subname string) (name string, ok, partial
 		name = m.unique(c.name, rewrite(subname))
 	}
 
-	matchMutex.Lock()
-	defer matchMutex.Unlock()
-
 	// We check the full array of paths each time to allow for the case that a pattern contains a '/'.
 	elem := strings.Split(name, "/")