diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go
index 899d34dd3d4..293d95e35b6 100644
--- a/src/cmd/dist/test.go
+++ b/src/cmd/dist/test.go
@@ -660,6 +660,10 @@ func (t *tester) registerTests() {
 		}
 	}
 
+	if t.race {
+		return
+	}
+
 	// Test the os/user package in the pure-Go mode too.
 	if !t.compileOnly {
 		t.registerTest("osusergo", "os/user with tag osusergo",
@@ -681,10 +685,6 @@ func (t *tester) registerTests() {
 			})
 	}
 
-	if t.race {
-		return
-	}
-
 	// Runtime CPU tests.
 	if !t.compileOnly && goos != "js" { // js can't handle -cpu != 1
 		t.registerTest("runtime:cpu124", "GOMAXPROCS=2 runtime -cpu=1,2,4 -quick",