diff --git a/src/runtime/race/race_test.go b/src/runtime/race/race_test.go
index 98936e3d3e..1c8bc949bf 100644
--- a/src/runtime/race/race_test.go
+++ b/src/runtime/race/race_test.go
@@ -190,6 +190,12 @@ func runTests(t *testing.T) ([]byte, error) {
 		// in the map concurrent access detector).
 		return out, errors.New("runtime fatal error")
 	}
+	// A crash in the map concurrent access detector will cause other tests not to run.
+	// Perhaps we should run tests with concurrent map access separately to avoid this,
+	// but for the moment just skip the remaining tests.
+	if mapFatals == 0 {
+		return out, nil
+	}
 	if !bytes.Contains(out, []byte("ALL TESTS COMPLETE")) {
 		return out, errors.New("not all tests ran")
 	}