Revert "Make lots of tests run in parallel"

This reverts commit 323dc60712491c71ccdc5363c42df61f0a192487.

Reason for revert: Possible cause of test instability
Bug: 170513220
Test: soong tests

Change-Id: Iee168e9fbb4210569e6cffcc23e60d111403abb8
diff --git a/android/androidmk_test.go b/android/androidmk_test.go
index 8574dc9..a558f45 100644
--- a/android/androidmk_test.go
+++ b/android/androidmk_test.go
@@ -68,7 +68,6 @@
 }
 
 func TestAndroidMkSingleton_PassesUpdatedAndroidMkDataToCustomCallback(t *testing.T) {
-	t.Parallel()
 	bp := `
 	custom {
 		name: "foo",
@@ -104,7 +103,6 @@
 }
 
 func TestGetDistForGoals(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		bp                     string
 		expectedAndroidMkLines []string
diff --git a/android/apex_test.go b/android/apex_test.go
index 7507628..512b50f 100644
--- a/android/apex_test.go
+++ b/android/apex_test.go
@@ -20,7 +20,6 @@
 )
 
 func Test_mergeApexVariations(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name        string
 		in          []ApexInfo
diff --git a/android/arch_test.go b/android/arch_test.go
index 7ec050f..8525b03 100644
--- a/android/arch_test.go
+++ b/android/arch_test.go
@@ -36,7 +36,6 @@
 }
 
 func TestFilterArchStruct(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name     string
 		in       interface{}
@@ -275,7 +274,6 @@
 }
 
 func TestArchMutator(t *testing.T) {
-	t.Parallel()
 	var buildOSVariants []string
 	var buildOS32Variants []string
 	switch runtime.GOOS {
@@ -387,7 +385,6 @@
 }
 
 func TestArchMutatorNativeBridge(t *testing.T) {
-	t.Parallel()
 	bp := `
 		// This module is only enabled for x86.
 		module {
diff --git a/android/config_test.go b/android/config_test.go
index 0c907b7..274d59f 100644
--- a/android/config_test.go
+++ b/android/config_test.go
@@ -58,7 +58,6 @@
 
 // tests that ValidateConfigAnnotation works
 func TestValidateConfigAnnotations(t *testing.T) {
-	t.Parallel()
 	config := configType{}
 	err := validateConfigAnnotations(&config)
 	expectedError := `Field configType.PopulateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
@@ -75,7 +74,6 @@
 
 // run validateConfigAnnotations against each type that might have json annotations
 func TestProductConfigAnnotations(t *testing.T) {
-	t.Parallel()
 	err := validateConfigAnnotations(&productVariables{})
 	if err != nil {
 		t.Errorf(err.Error())
@@ -88,7 +86,6 @@
 }
 
 func TestMissingVendorConfig(t *testing.T) {
-	t.Parallel()
 	c := &config{}
 	if c.VendorConfig("test").Bool("not_set") {
 		t.Errorf("Expected false")
diff --git a/android/csuite_config_test.go b/android/csuite_config_test.go
index ec93ed6..bf1a19a 100644
--- a/android/csuite_config_test.go
+++ b/android/csuite_config_test.go
@@ -32,7 +32,6 @@
 }
 
 func TestCSuiteConfig(t *testing.T) {
-	t.Parallel()
 	ctx := testCSuiteConfig(t, `
 csuite_config { name: "plain"}
 csuite_config { name: "with_manifest", test_config: "manifest.xml" }
diff --git a/android/defaults_test.go b/android/defaults_test.go
index a6abe8f..d096b2f 100644
--- a/android/defaults_test.go
+++ b/android/defaults_test.go
@@ -59,7 +59,6 @@
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "transitive",
@@ -103,7 +102,6 @@
 }
 
 func TestDefaultsAllowMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "defaults",
diff --git a/android/depset_test.go b/android/depset_test.go
index 1ad27eb..c328127 100644
--- a/android/depset_test.go
+++ b/android/depset_test.go
@@ -64,7 +64,6 @@
 // Tests based on Bazel's ExpanderTestBase.java to ensure compatibility
 // https://github.com/bazelbuild/bazel/blob/master/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java
 func TestDepSet(t *testing.T) {
-	t.Parallel()
 	a := PathForTesting("a")
 	b := PathForTesting("b")
 	c := PathForTesting("c")
@@ -275,7 +274,6 @@
 }
 
 func TestDepSetInvalidOrder(t *testing.T) {
-	t.Parallel()
 	orders := []DepSetOrder{POSTORDER, PREORDER, TOPOLOGICAL}
 
 	run := func(t *testing.T, order1, order2 DepSetOrder) {
diff --git a/android/expand_test.go b/android/expand_test.go
index 7992288..12179ed 100644
--- a/android/expand_test.go
+++ b/android/expand_test.go
@@ -163,7 +163,6 @@
 }
 
 func TestExpand(t *testing.T) {
-	t.Parallel()
 	for _, test := range expandTestCases {
 		got, err := Expand(test.in, func(s string) (string, error) {
 			s, _, err := expander(s)
@@ -180,7 +179,6 @@
 }
 
 func TestExpandNinjaEscaped(t *testing.T) {
-	t.Parallel()
 	for _, test := range expandTestCases {
 		got, err := ExpandNinjaEscaped(test.in, expander)
 		if err != nil && !test.err {
diff --git a/android/module_test.go b/android/module_test.go
index b2a41e4..6e648d7 100644
--- a/android/module_test.go
+++ b/android/module_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestSrcIsModule(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s string
 	}
@@ -67,7 +66,6 @@
 }
 
 func TestSrcIsModuleWithTag(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s string
 	}
@@ -166,7 +164,6 @@
 }
 
 func TestErrorDependsOnDisabledModule(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 	ctx.RegisterModuleType("deps", depsModuleFactory)
 
diff --git a/android/mutator_test.go b/android/mutator_test.go
index ce073bf..191b535 100644
--- a/android/mutator_test.go
+++ b/android/mutator_test.go
@@ -59,7 +59,6 @@
 }
 
 func TestMutatorAddMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		test {
 			name: "foo",
@@ -93,7 +92,6 @@
 }
 
 func TestModuleString(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	var moduleStrings []string
@@ -192,7 +190,6 @@
 }
 
 func TestFinalDepsPhase(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	finalGot := map[string]int{}
@@ -270,7 +267,6 @@
 }
 
 func TestNoCreateVariationsInFinalDeps(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 
 	checkErr := func() {
diff --git a/android/namespace_test.go b/android/namespace_test.go
index 5cce3e4..66c0d89 100644
--- a/android/namespace_test.go
+++ b/android/namespace_test.go
@@ -24,7 +24,6 @@
 )
 
 func TestDependingOnModuleInSameNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -49,7 +48,6 @@
 }
 
 func TestDependingOnModuleInRootNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			".": `
@@ -72,7 +70,6 @@
 }
 
 func TestImplicitlyImportRootNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			".": `
@@ -95,7 +92,6 @@
 }
 
 func TestDependingOnBlueprintModuleInRootNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			".": `
@@ -118,7 +114,6 @@
 }
 
 func TestDependingOnModuleInImportedNamespace(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -148,7 +143,6 @@
 }
 
 func TestDependingOnModuleInNonImportedNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -189,7 +183,6 @@
 }
 
 func TestDependingOnModuleByFullyQualifiedReference(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -217,7 +210,6 @@
 }
 
 func TestSameNameInTwoNamespaces(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -268,7 +260,6 @@
 }
 
 func TestSearchOrder(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -357,7 +348,6 @@
 }
 
 func TestTwoNamespacesCanImportEachOther(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -388,7 +378,6 @@
 }
 
 func TestImportingNonexistentNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -413,7 +402,6 @@
 }
 
 func TestNamespacesDontInheritParentNamespaces(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -445,7 +433,6 @@
 }
 
 func TestModulesDoReceiveParentNamespace(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `
@@ -468,7 +455,6 @@
 }
 
 func TestNamespaceImportsNotTransitive(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -510,7 +496,6 @@
 }
 
 func TestTwoNamepacesInSameDir(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -531,7 +516,6 @@
 }
 
 func TestNamespaceNotAtTopOfFile(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -553,7 +537,6 @@
 }
 
 func TestTwoModulesWithSameNameInSameNamespace(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestExpectErrs(
 		map[string]string{
 			"dir1": `
@@ -579,7 +562,6 @@
 }
 
 func TestDeclaringNamespaceInNonAndroidBpFile(t *testing.T) {
-	t.Parallel()
 	_, errs := setupTestFromFiles(
 		map[string][]byte{
 			"Android.bp": []byte(`
@@ -603,7 +585,6 @@
 
 // so that the generated .ninja file will have consistent names
 func TestConsistentNamespaceNames(t *testing.T) {
-	t.Parallel()
 	ctx := setupTest(t,
 		map[string]string{
 			"dir1": "soong_namespace{}",
@@ -623,7 +604,6 @@
 
 // so that the generated .ninja file will have consistent names
 func TestRename(t *testing.T) {
-	t.Parallel()
 	_ = setupTest(t,
 		map[string]string{
 			"dir1": `
diff --git a/android/neverallow_test.go b/android/neverallow_test.go
index 306c509..56a07dc 100644
--- a/android/neverallow_test.go
+++ b/android/neverallow_test.go
@@ -343,7 +343,6 @@
 }
 
 func TestNeverallow(t *testing.T) {
-	t.Parallel()
 	for _, test := range neverallowTests {
 		// Create a test per config to allow for test specific config, e.g. test rules.
 		config := TestConfig(buildDir, nil, "", test.fs)
diff --git a/android/onceper_test.go b/android/onceper_test.go
index da0b10d..1a55ff4 100644
--- a/android/onceper_test.go
+++ b/android/onceper_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestOncePer_Once(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -37,7 +36,6 @@
 }
 
 func TestOncePer_Once_wait(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -53,7 +51,6 @@
 }
 
 func TestOncePer_Get(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -70,7 +67,6 @@
 }
 
 func TestOncePer_Get_panic(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -86,7 +82,6 @@
 }
 
 func TestOncePer_Get_wait(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -102,7 +97,6 @@
 }
 
 func TestOncePer_OnceStringSlice(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -119,7 +113,6 @@
 }
 
 func TestOncePer_Once2StringSlice(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
@@ -136,7 +129,6 @@
 }
 
 func TestNewOnceKey(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key1 := NewOnceKey("key")
 	key2 := NewOnceKey("key")
@@ -154,7 +146,6 @@
 }
 
 func TestNewCustomOnceKey(t *testing.T) {
-	t.Parallel()
 	type key struct {
 		key string
 	}
@@ -175,7 +166,6 @@
 }
 
 func TestOncePerReentrant(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key1 := NewOnceKey("key")
 	key2 := NewOnceKey("key")
@@ -188,7 +178,6 @@
 
 // Test that a recovered panic in a Once function doesn't deadlock
 func TestOncePerPanic(t *testing.T) {
-	t.Parallel()
 	once := OncePer{}
 	key := NewOnceKey("key")
 
diff --git a/android/package_test.go b/android/package_test.go
index a4b4c60..04dfc08 100644
--- a/android/package_test.go
+++ b/android/package_test.go
@@ -56,7 +56,6 @@
 }
 
 func TestPackage(t *testing.T) {
-	t.Parallel()
 	for _, test := range packageTests {
 		t.Run(test.name, func(t *testing.T) {
 			_, errs := testPackage(test.fs)
diff --git a/android/path_properties_test.go b/android/path_properties_test.go
index 9bbb571..f367b82 100644
--- a/android/path_properties_test.go
+++ b/android/path_properties_test.go
@@ -59,7 +59,6 @@
 }
 
 func TestPathDepsMutator(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		bp   string
diff --git a/android/paths_test.go b/android/paths_test.go
index 03e1410..d099f65 100644
--- a/android/paths_test.go
+++ b/android/paths_test.go
@@ -110,7 +110,6 @@
 }...)
 
 func TestValidateSafePath(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range validateSafePathTestCases {
 		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
 			ctx := &configErrorWrapper{}
@@ -124,7 +123,6 @@
 }
 
 func TestValidatePath(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range validatePathTestCases {
 		t.Run(strings.Join(testCase.in, ","), func(t *testing.T) {
 			ctx := &configErrorWrapper{}
@@ -138,7 +136,6 @@
 }
 
 func TestOptionalPath(t *testing.T) {
-	t.Parallel()
 	var path OptionalPath
 	checkInvalidOptionalPath(t, path)
 
@@ -256,7 +253,6 @@
 }
 
 func TestPathForModuleInstall(t *testing.T) {
-	t.Parallel()
 	testConfig := pathTestConfig("")
 
 	hostTarget := Target{Os: Linux, Arch: Arch{ArchType: X86}}
@@ -661,7 +657,6 @@
 }
 
 func TestDirectorySortedPaths(t *testing.T) {
-	t.Parallel()
 	config := TestConfig("out", nil, "", map[string][]byte{
 		"Android.bp": nil,
 		"a.txt":      nil,
@@ -744,7 +739,6 @@
 }
 
 func TestMaybeRel(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		base   string
@@ -802,7 +796,6 @@
 }
 
 func TestPathForSource(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name     string
 		buildDir string
@@ -1035,7 +1028,6 @@
 }
 
 func TestPathsForModuleSrc(t *testing.T) {
-	t.Parallel()
 	tests := []pathForModuleSrcTestCase{
 		{
 			name: "path",
@@ -1131,7 +1123,6 @@
 }
 
 func TestPathForModuleSrc(t *testing.T) {
-	t.Parallel()
 	tests := []pathForModuleSrcTestCase{
 		{
 			name: "path",
@@ -1199,7 +1190,6 @@
 }
 
 func TestPathsForModuleSrc_AllowMissingDependencies(t *testing.T) {
-	t.Parallel()
 	bp := `
 		test {
 			name: "foo",
diff --git a/android/prebuilt_test.go b/android/prebuilt_test.go
index 40fced8..854395e 100644
--- a/android/prebuilt_test.go
+++ b/android/prebuilt_test.go
@@ -262,7 +262,6 @@
 }
 
 func TestPrebuilts(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"prebuilt_file": nil,
 		"source_file":   nil,
diff --git a/android/rule_builder_test.go b/android/rule_builder_test.go
index d205a5b..c41b067 100644
--- a/android/rule_builder_test.go
+++ b/android/rule_builder_test.go
@@ -264,7 +264,6 @@
 }
 
 func TestRuleBuilder(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"dep_fixer":  nil,
 		"input":      nil,
@@ -456,7 +455,6 @@
 }
 
 func TestRuleBuilder_Build(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"bar": nil,
 		"cp":  nil,
@@ -548,7 +546,6 @@
 }
 
 func Test_ninjaEscapeExceptForSpans(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		s     string
 		spans [][2]int
diff --git a/android/soong_config_modules_test.go b/android/soong_config_modules_test.go
index f0f1462..f905b1a 100644
--- a/android/soong_config_modules_test.go
+++ b/android/soong_config_modules_test.go
@@ -38,7 +38,6 @@
 func (t soongConfigTestModule) GenerateAndroidBuildActions(ModuleContext) {}
 
 func TestSoongConfigModule(t *testing.T) {
-	t.Parallel()
 	configBp := `
 		soong_config_module_type {
 			name: "acme_test_defaults",
diff --git a/android/soongconfig/modules_test.go b/android/soongconfig/modules_test.go
index ff4883e..4190016 100644
--- a/android/soongconfig/modules_test.go
+++ b/android/soongconfig/modules_test.go
@@ -20,7 +20,6 @@
 )
 
 func Test_CanonicalizeToProperty(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		arg  string
@@ -67,7 +66,6 @@
 }
 
 func Test_typeForPropertyFromPropertyStruct(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name     string
 		ps       interface{}
@@ -188,7 +186,6 @@
 }
 
 func Test_createAffectablePropertiesType(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name                 string
 		affectableProperties []string
diff --git a/android/util_test.go b/android/util_test.go
index 8c42157..25b52ca 100644
--- a/android/util_test.go
+++ b/android/util_test.go
@@ -60,7 +60,6 @@
 }
 
 func TestFirstUniqueStrings(t *testing.T) {
-	t.Parallel()
 	f := func(t *testing.T, imp func([]string) []string, in, want []string) {
 		t.Helper()
 		out := imp(in)
@@ -121,7 +120,6 @@
 }
 
 func TestLastUniqueStrings(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range lastUniqueStringsTestCases {
 		out := LastUniqueStrings(testCase.in)
 		if !reflect.DeepEqual(out, testCase.out) {
@@ -134,7 +132,6 @@
 }
 
 func TestJoinWithPrefix(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name     string
 		input    []string
@@ -174,7 +171,6 @@
 }
 
 func TestIndexList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c"}
 
 	testcases := []struct {
@@ -214,7 +210,6 @@
 }
 
 func TestInList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a"}
 
 	testcases := []struct {
@@ -246,7 +241,6 @@
 }
 
 func TestPrefixInList(t *testing.T) {
-	t.Parallel()
 	prefixes := []string{"a", "b"}
 
 	testcases := []struct {
@@ -282,7 +276,6 @@
 }
 
 func TestFilterList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c", "c", "b", "d", "a"}
 	filter := []string{"a", "c"}
 	remainder, filtered := FilterList(input, filter)
@@ -307,7 +300,6 @@
 }
 
 func TestRemoveListFromList(t *testing.T) {
-	t.Parallel()
 	input := []string{"a", "b", "c", "d", "a", "c", "d"}
 	filter := []string{"a", "c"}
 	expected := []string{"b", "d", "d"}
@@ -322,7 +314,6 @@
 }
 
 func TestRemoveFromList(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name          string
 		key           string
@@ -426,7 +417,6 @@
 }
 
 func TestSplitFileExt(t *testing.T) {
-	t.Parallel()
 	t.Run("soname with version", func(t *testing.T) {
 		root, suffix, ext := SplitFileExt("libtest.so.1.0.30")
 		expected := "libtest"
@@ -492,7 +482,6 @@
 }
 
 func Test_Shard(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		strings   []string
 		shardSize int
diff --git a/android/variable_test.go b/android/variable_test.go
index 9348b0d..9cafedd 100644
--- a/android/variable_test.go
+++ b/android/variable_test.go
@@ -112,7 +112,6 @@
 }
 
 func TestPrintfIntoProperty(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range printfIntoPropertyTestCases {
 		s := testCase.in
 		v := reflect.ValueOf(&s).Elem()
@@ -158,7 +157,6 @@
 }
 
 func TestProductVariables(t *testing.T) {
-	t.Parallel()
 	ctx := NewTestContext()
 	// A module type that has a srcs property but not a cflags property.
 	ctx.RegisterModuleType("module1", testProductVariableModuleFactoryFactory(&struct {
@@ -267,7 +265,6 @@
 
 // Test a defaults module that supports more product variable properties than the target module.
 func TestProductVariablesDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		defaults {
 			name: "defaults",
diff --git a/android/visibility_test.go b/android/visibility_test.go
index 8de5fa9..9d9e574 100644
--- a/android/visibility_test.go
+++ b/android/visibility_test.go
@@ -1140,7 +1140,6 @@
 }
 
 func TestVisibility(t *testing.T) {
-	t.Parallel()
 	for _, test := range visibilityTests {
 		t.Run(test.name, func(t *testing.T) {
 			ctx, errs := testVisibility(buildDir, test.fs)
diff --git a/androidmk/androidmk/androidmk_test.go b/androidmk/androidmk/androidmk_test.go
index 6e70129..16cb138 100644
--- a/androidmk/androidmk/androidmk_test.go
+++ b/androidmk/androidmk/androidmk_test.go
@@ -1449,7 +1449,6 @@
 }
 
 func TestEndToEnd(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		expected, err := bpfix.Reformat(test.expected)
 		if err != nil {
diff --git a/androidmk/parser/make_strings_test.go b/androidmk/parser/make_strings_test.go
index 9622068..6995e89 100644
--- a/androidmk/parser/make_strings_test.go
+++ b/androidmk/parser/make_strings_test.go
@@ -89,7 +89,6 @@
 }
 
 func TestMakeStringSplitN(t *testing.T) {
-	t.Parallel()
 	for _, test := range splitNTestCases {
 		got := test.in.SplitN(test.sep, test.n)
 		gotString := dumpArray(got)
@@ -119,7 +118,6 @@
 }
 
 func TestMakeStringValue(t *testing.T) {
-	t.Parallel()
 	for _, test := range valueTestCases {
 		got := test.in.Value(nil)
 		if got != test.expected {
@@ -163,7 +161,6 @@
 }
 
 func TestMakeStringWords(t *testing.T) {
-	t.Parallel()
 	for _, test := range splitWordsTestCases {
 		got := test.in.Words()
 		gotString := dumpArray(got)
diff --git a/androidmk/parser/parser_test.go b/androidmk/parser/parser_test.go
index 7c05a0c..f562c29 100644
--- a/androidmk/parser/parser_test.go
+++ b/androidmk/parser/parser_test.go
@@ -37,7 +37,6 @@
 }
 
 func TestParse(t *testing.T) {
-	t.Parallel()
 	for _, test := range parserTestCases {
 		t.Run(test.name, func(t *testing.T) {
 			p := NewParser(test.name, bytes.NewBufferString(test.in))
diff --git a/apex/apex_test.go b/apex/apex_test.go
index 5a9a3b1..cf2c953 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -345,7 +345,6 @@
 
 // Minimal test
 func TestBasicApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_defaults {
 			name: "myapex-defaults",
@@ -598,7 +597,6 @@
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_defaults {
 			name: "myapex-defaults",
@@ -673,7 +671,6 @@
 }
 
 func TestApexManifest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -695,7 +692,6 @@
 }
 
 func TestBasicZipApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -746,7 +742,6 @@
 }
 
 func TestApexWithStubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -939,7 +934,6 @@
 }
 
 func TestApexWithExplicitStubsDependency(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex2",
@@ -1027,7 +1021,6 @@
 }
 
 func TestApexWithRuntimeLibsDependency(t *testing.T) {
-	t.Parallel()
 	/*
 		myapex
 		  |
@@ -1097,7 +1090,6 @@
 }
 
 func TestRuntimeApexShouldInstallHwasanIfLibcDependsOnIt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, "", func(fs map[string][]byte, config android.Config) {
 		bp := `
 		apex {
@@ -1161,7 +1153,6 @@
 }
 
 func TestRuntimeApexShouldInstallHwasanIfHwaddressSanitized(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, "", func(fs map[string][]byte, config android.Config) {
 		bp := `
 		apex {
@@ -1223,7 +1214,6 @@
 }
 
 func TestApexDependsOnLLNDKTransitively(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name          string
 		minSdkVersion string
@@ -1313,7 +1303,6 @@
 }
 
 func TestApexWithSystemLibsStubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1404,7 +1393,6 @@
 }
 
 func TestApexMinSdkVersion_NativeModulesShouldBeBuiltAgainstStubs(t *testing.T) {
-	t.Parallel()
 	// there are three links between liba --> libz
 	// 1) myapex -> libx -> liba -> libz    : this should be #29 link, but fallback to #28
 	// 2) otherapex -> liby -> liba -> libz : this should be #30 link
@@ -1491,7 +1479,6 @@
 }
 
 func TestApexMinSdkVersion_SupportsCodeNames(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1541,7 +1528,6 @@
 }
 
 func TestApexMinSdkVersion_DefaultsToLatest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1587,7 +1573,6 @@
 }
 
 func TestPlatformUsesLatestStubsFromApexes(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1635,7 +1620,6 @@
 }
 
 func TestQApexesUseLatestStubsInBundledBuildsAndHWASAN(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1675,7 +1659,6 @@
 }
 
 func TestQTargetApexUsesStaticUnwinder(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -1706,7 +1689,6 @@
 }
 
 func TestApexMinSdkVersion_ErrorIfIncompatibleStubs(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"libz" .*: not found a version\(<=29\)`, `
 		apex {
 			name: "myapex",
@@ -1742,7 +1724,6 @@
 }
 
 func TestApexMinSdkVersion_ErrorIfIncompatibleVersion(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "mylib".*: should support min_sdk_version\(29\)`, `
 		apex {
 			name: "myapex",
@@ -1771,7 +1752,6 @@
 }
 
 func TestApexMinSdkVersion_Okay(t *testing.T) {
-	t.Parallel()
 	testApex(t, `
 		apex {
 			name: "myapex",
@@ -1822,7 +1802,6 @@
 }
 
 func TestJavaStableSdkVersion(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name          string
 		expectedError string
@@ -1940,7 +1919,6 @@
 }
 
 func TestApexMinSdkVersion_ErrorIfDepIsNewer(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "mylib2".*: should support min_sdk_version\(29\) for "myapex"`, `
 		apex {
 			name: "myapex",
@@ -1982,7 +1960,6 @@
 }
 
 func TestApexMinSdkVersion_ErrorIfDepIsNewer_Java(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "bar".*: should support min_sdk_version\(29\) for "myapex"`, `
 		apex {
 			name: "myapex",
@@ -2018,7 +1995,6 @@
 }
 
 func TestApexMinSdkVersion_OkayEvenWhenDepIsNewer_IfItSatisfiesApexMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2072,7 +2048,6 @@
 }
 
 func TestFilesInSubDir(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2135,7 +2110,6 @@
 }
 
 func TestFilesInSubDirWhenNativeBridgeEnabled(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2194,7 +2168,6 @@
 }
 
 func TestUseVendor(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2249,7 +2222,6 @@
 }
 
 func TestUseVendorNotAllowedForSystemApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .*: use_vendor: not allowed`, `
 		apex {
 			name: "myapex",
@@ -2282,7 +2254,6 @@
 }
 
 func TestUseVendorFailsIfNotVendorAvailable(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `dependency "mylib" of "myapex" missing variant:\n.*image:vendor`, `
 		apex {
 			name: "myapex",
@@ -2307,7 +2278,6 @@
 }
 
 func TestVendorApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2353,7 +2323,6 @@
 }
 
 func TestVendorApex_use_vndk_as_stable(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2407,7 +2376,6 @@
 }
 
 func TestApex_withPrebuiltFirmware(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name           string
 		additionalProp string
@@ -2444,7 +2412,6 @@
 }
 
 func TestAndroidMk_UseVendorRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2479,7 +2446,6 @@
 }
 
 func TestAndroidMk_VendorApexRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2511,7 +2477,6 @@
 }
 
 func TestAndroidMkWritesCommonProperties(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2541,7 +2506,6 @@
 }
 
 func TestStaticLinking(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2586,7 +2550,6 @@
 }
 
 func TestKeys(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex_keytest",
@@ -2643,7 +2606,6 @@
 }
 
 func TestCertificate(t *testing.T) {
-	t.Parallel()
 	t.Run("if unspecified, it defaults to DefaultAppCertificate", func(t *testing.T) {
 		ctx, _ := testApex(t, `
 			apex {
@@ -2772,7 +2734,6 @@
 }
 
 func TestMacro(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -2900,7 +2861,6 @@
 }
 
 func TestHeaderLibsDependency(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3044,7 +3004,6 @@
 }
 
 func TestVndkApexCurrent(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3098,7 +3057,6 @@
 }
 
 func TestVndkApexWithPrebuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3181,7 +3139,6 @@
 }
 
 func TestVndkApexVersion(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3248,7 +3205,6 @@
 }
 
 func TestVndkApexErrorWithDuplicateVersion(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex_v27.*" .*: vndk_version: 27 is already defined in "myapex_v27.*"`, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3295,7 +3251,6 @@
 }
 
 func TestVndkApexNameRule(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3327,7 +3282,6 @@
 }
 
 func TestVndkApexSkipsNativeBridgeSupportedModules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3366,7 +3320,6 @@
 }
 
 func TestVndkApexDoesntSupportNativeBridgeSupported(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .*: native_bridge_supported: .* doesn't support native bridge binary`, `
 		apex_vndk {
 			name: "myapex",
@@ -3397,7 +3350,6 @@
 }
 
 func TestVndkApexWithBinder32(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex_v27",
@@ -3464,7 +3416,6 @@
 }
 
 func TestVndkApexShouldNotProvideNativeLibs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -3499,7 +3450,6 @@
 }
 
 func TestDependenciesInApexManifest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex_nodep",
@@ -3604,7 +3554,6 @@
 }
 
 func TestApexName(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3649,7 +3598,6 @@
 }
 
 func TestNonTestApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3702,7 +3650,6 @@
 }
 
 func TestTestApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_test {
 			name: "myapex",
@@ -3751,7 +3698,6 @@
 }
 
 func TestApexWithTarget(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3842,7 +3788,6 @@
 }
 
 func TestApexWithShBinary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3871,7 +3816,6 @@
 }
 
 func TestApexInVariousPartition(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		propName, parition, flattenedPartition string
 	}{
@@ -3916,7 +3860,6 @@
 }
 
 func TestFileContexts_FindInDefaultLocationIfNotSet(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -3935,7 +3878,6 @@
 }
 
 func TestFileContexts_ShouldBeUnderSystemSepolicyForSystemApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: file_contexts: should be under system/sepolicy`, `
 		apex {
 			name: "myapex",
@@ -3954,7 +3896,6 @@
 }
 
 func TestFileContexts_ProductSpecificApexes(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: file_contexts: cannot find`, `
 		apex {
 			name: "myapex",
@@ -3992,7 +3933,6 @@
 }
 
 func TestFileContexts_SetViaFileGroup(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4020,7 +3960,6 @@
 }
 
 func TestApexKeyFromOtherModule(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_key {
 			name: "myapex.key",
@@ -4054,7 +3993,6 @@
 }
 
 func TestPrebuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		prebuilt_apex {
 			name: "myapex",
@@ -4078,7 +4016,6 @@
 }
 
 func TestPrebuiltFilenameOverride(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		prebuilt_apex {
 			name: "myapex",
@@ -4096,7 +4033,6 @@
 }
 
 func TestPrebuiltOverrides(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		prebuilt_apex {
 			name: "myapex.prebuilt",
@@ -4117,7 +4053,6 @@
 }
 
 func TestApexWithTests(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_test {
 			name: "myapex",
@@ -4229,7 +4164,6 @@
 }
 
 func TestInstallExtraFlattenedApexes(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4253,7 +4187,6 @@
 }
 
 func TestApexUsesOtherApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4314,7 +4247,6 @@
 }
 
 func TestApexUsesFailsIfNotProvided(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `uses: "commonapex" does not provide native_shared_libs`, `
 		apex {
 			name: "myapex",
@@ -4355,7 +4287,6 @@
 }
 
 func TestApexUsesFailsIfUseVenderMismatch(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `use_vendor: "commonapex" has different value of use_vendor`, `
 		apex {
 			name: "myapex",
@@ -4381,7 +4312,6 @@
 }
 
 func TestErrorsIfDepsAreNotEnabled(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `module "myapex" .* depends on disabled module "libfoo"`, `
 		apex {
 			name: "myapex",
@@ -4428,7 +4358,6 @@
 }
 
 func TestApexWithApps(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4507,7 +4436,6 @@
 }
 
 func TestApexWithAppImports(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4556,7 +4484,6 @@
 }
 
 func TestApexWithAppImportsPrefer(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4598,7 +4525,6 @@
 }
 
 func TestApexWithTestHelperApp(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4630,7 +4556,6 @@
 }
 
 func TestApexPropertiesShouldBeDefaultable(t *testing.T) {
-	t.Parallel()
 	// libfoo's apex_available comes from cc_defaults
 	testApexError(t, `requires "libfoo" that is not available for the APEX`, `
 	apex {
@@ -4665,7 +4590,6 @@
 }
 
 func TestApexAvailable_DirectDep(t *testing.T) {
-	t.Parallel()
 	// libfoo is not available to myapex, but only to otherapex
 	testApexError(t, "requires \"libfoo\" that is not available for the APEX", `
 	apex {
@@ -4701,7 +4625,6 @@
 }
 
 func TestApexAvailable_IndirectDep(t *testing.T) {
-	t.Parallel()
 	// libbbaz is an indirect dep
 	testApexError(t, `requires "libbaz" that is not available for the APEX. Dependency path:
 .*via tag apex\.dependencyTag.*name:sharedLib.*
@@ -4746,7 +4669,6 @@
 }
 
 func TestApexAvailable_InvalidApexName(t *testing.T) {
-	t.Parallel()
 	testApexError(t, "\"otherapex\" is not a valid module name", `
 	apex {
 		name: "myapex",
@@ -4806,7 +4728,6 @@
 }
 
 func TestApexAvailable_CheckForPlatform(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 	apex {
 		name: "myapex",
@@ -4869,7 +4790,6 @@
 }
 
 func TestApexAvailable_CreatedForApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 	apex {
 		name: "myapex",
@@ -4904,7 +4824,6 @@
 }
 
 func TestOverrideApex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -4988,7 +4907,6 @@
 }
 
 func TestLegacyAndroid10Support(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5044,7 +4962,6 @@
 }
 
 func TestJavaSDKLibrary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5077,7 +4994,6 @@
 }
 
 func TestJavaSDKLibrary_WithinApex(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5125,7 +5041,6 @@
 }
 
 func TestJavaSDKLibrary_CrossBoundary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5171,7 +5086,6 @@
 }
 
 func TestJavaSDKLibrary_ImportPreferred(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, ``,
 		withFiles(map[string][]byte{
 			"apex/a.java":             nil,
@@ -5257,7 +5171,6 @@
 }
 
 func TestJavaSDKLibrary_ImportOnly(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `java_libs: "foo" is not configured to be compiled into dex`, `
 		apex {
 			name: "myapex",
@@ -5284,7 +5197,6 @@
 }
 
 func TestCompatConfig(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5319,7 +5231,6 @@
 }
 
 func TestRejectNonInstallableJavaLibrary(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myjar" is not configured to be compiled into dex`, `
 		apex {
 			name: "myapex",
@@ -5345,7 +5256,6 @@
 }
 
 func TestCarryRequiredModuleNames(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5384,7 +5294,6 @@
 }
 
 func TestSymlinksFromApexToSystem(t *testing.T) {
-	t.Parallel()
 	bp := `
 		apex {
 			name: "myapex",
@@ -5514,7 +5423,6 @@
 }
 
 func TestSymlinksFromApexToSystemRequiredModuleNames(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5566,7 +5474,6 @@
 }
 
 func TestApexWithJniLibs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5608,7 +5515,6 @@
 }
 
 func TestApexMutatorsDontRunIfDisabled(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5630,7 +5536,6 @@
 }
 
 func TestAppBundle(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5661,7 +5566,6 @@
 }
 
 func TestAppSetBundle(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -5836,7 +5740,6 @@
 }
 
 func TestUpdatable_should_set_min_sdk_version(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `"myapex" .*: updatable: updatable APEXes should set min_sdk_version`, `
 		apex {
 			name: "myapex",
@@ -5853,7 +5756,6 @@
 }
 
 func TestNoUpdatableJarsInBootImage(t *testing.T) {
-	t.Parallel()
 	var err string
 	var transform func(*dexpreopt.GlobalConfig)
 
@@ -5990,7 +5892,6 @@
 }
 
 func TestApexPermittedPackagesRules(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name            string
 		expectedError   string
@@ -6074,7 +5975,6 @@
 }
 
 func TestTestFor(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6132,7 +6032,6 @@
 }
 
 func TestApexSet(t *testing.T) {
-	t.Parallel()
 	ctx, config := testApex(t, `
 		apex_set {
 			name: "myapex",
@@ -6172,7 +6071,6 @@
 }
 
 func TestNoStaticLinkingToStubsLib(t *testing.T) {
-	t.Parallel()
 	testApexError(t, `.*required by "mylib" is a native library providing stub.*`, `
 		apex {
 			name: "myapex",
@@ -6209,7 +6107,6 @@
 }
 
 func TestApexKeysTxt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6250,7 +6147,6 @@
 }
 
 func TestAllowedFiles(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex {
 			name: "myapex",
@@ -6306,7 +6202,6 @@
 }
 
 func TestNonPreferredPrebuiltDependency(t *testing.T) {
-	t.Parallel()
 	_, _ = testApex(t, `
 		apex {
 			name: "myapex",
diff --git a/apex/vndk_test.go b/apex/vndk_test.go
index e623990..60b6ed5 100644
--- a/apex/vndk_test.go
+++ b/apex/vndk_test.go
@@ -9,7 +9,6 @@
 )
 
 func TestVndkApexForVndkLite(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testApex(t, `
 		apex_vndk {
 			name: "myapex",
@@ -63,7 +62,6 @@
 }
 
 func TestVndkApexUsesVendorVariant(t *testing.T) {
-	t.Parallel()
 	bp := `
 		apex_vndk {
 			name: "myapex",
diff --git a/bpf/bpf_test.go b/bpf/bpf_test.go
index 44d4cc3..d06d7d1 100644
--- a/bpf/bpf_test.go
+++ b/bpf/bpf_test.go
@@ -66,7 +66,6 @@
 }
 
 func TestBpfDataDependency(t *testing.T) {
-	t.Parallel()
 	bp := `
 		bpf {
 			name: "bpf.o",
diff --git a/bpfix/bpfix/bpfix_test.go b/bpfix/bpfix/bpfix_test.go
index 2bbbd7f..ef9814f 100644
--- a/bpfix/bpfix/bpfix_test.go
+++ b/bpfix/bpfix/bpfix_test.go
@@ -116,7 +116,6 @@
 }
 
 func TestSimplifyKnownVariablesDuplicatingEachOther(t *testing.T) {
-	t.Parallel()
 	// TODO use []Expression{} once buildTree above can support it (which is after b/38325146 is done)
 	implFilterListTest(t, []string{"include"}, []string{"include"}, nil)
 	implFilterListTest(t, []string{"include1"}, []string{"include2"}, []string{"include1"})
@@ -170,7 +169,6 @@
 }
 
 func TestMergeMatchingProperties(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -260,7 +258,6 @@
 }
 
 func TestReorderCommonProperties(t *testing.T) {
-	t.Parallel()
 	var tests = []struct {
 		name string
 		in   string
@@ -347,7 +344,6 @@
 }
 
 func TestRemoveMatchingModuleListProperties(t *testing.T) {
-	t.Parallel()
 	var tests = []struct {
 		name string
 		in   string
@@ -503,7 +499,6 @@
 }
 
 func TestReplaceJavaStaticLibs(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -562,7 +557,6 @@
 }
 
 func TestRewritePrebuilts(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -629,7 +623,6 @@
 }
 
 func TestRewriteCtsModuleTypes(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -701,7 +694,6 @@
 }
 
 func TestRewritePrebuiltEtc(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -777,7 +769,6 @@
 }
 
 func TestRewriteAndroidTest(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -811,7 +802,6 @@
 }
 
 func TestRewriteAndroidAppImport(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -861,7 +851,6 @@
 }
 
 func TestRemoveEmptyLibDependencies(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -916,7 +905,6 @@
 }
 
 func TestRemoveHidlInterfaceTypes(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -948,7 +936,6 @@
 }
 
 func TestRemoveSoongConfigBoolVariable(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
@@ -1013,7 +1000,6 @@
 }
 
 func TestRemovePdkProperty(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name string
 		in   string
diff --git a/cc/cc_test.go b/cc/cc_test.go
index 8d00239..e0d4640 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -128,7 +128,6 @@
 )
 
 func TestFuchsiaDeps(t *testing.T) {
-	t.Parallel()
 	t.Helper()
 
 	bp := `
@@ -166,7 +165,6 @@
 }
 
 func TestFuchsiaTargetDecl(t *testing.T) {
-	t.Parallel()
 	t.Helper()
 
 	bp := `
@@ -193,7 +191,6 @@
 }
 
 func TestVendorSrc(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library {
 			name: "libTest",
@@ -324,7 +321,6 @@
 }
 
 func TestVndk(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -451,7 +447,6 @@
 }
 
 func TestVndkWithHostSupported(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library {
 			name: "libvndk_host_supported",
@@ -486,7 +481,6 @@
 }
 
 func TestVndkLibrariesTxtAndroidMk(t *testing.T) {
-	t.Parallel()
 	bp := `
 		vndk_libraries_txt {
 			name: "llndk.libraries.txt",
@@ -502,7 +496,6 @@
 }
 
 func TestVndkUsingCoreVariant(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -550,7 +543,6 @@
 }
 
 func TestDataLibs(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_test_library {
 			name: "test_lib",
@@ -601,7 +593,6 @@
 }
 
 func TestDataLibsRelativeInstallPath(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_test_library {
 			name: "test_lib",
@@ -649,7 +640,6 @@
 }
 
 func TestVndkWhenVndkVersionIsNotSet(t *testing.T) {
-	t.Parallel()
 	ctx := testCcNoVndk(t, `
 		cc_library {
 			name: "libvndk",
@@ -673,7 +663,6 @@
 }
 
 func TestVndkDepError(t *testing.T) {
-	t.Parallel()
 	// Check whether an error is emitted when a VNDK lib depends on a system lib.
 	testCcError(t, "dependency \".*\" of \".*\" missing variant", `
 		cc_library {
@@ -853,7 +842,6 @@
 }
 
 func TestDoubleLoadbleDep(t *testing.T) {
-	t.Parallel()
 	// okay to link : LLNDK -> double_loadable VNDK
 	testCc(t, `
 		cc_library {
@@ -959,7 +947,6 @@
 }
 
 func TestVendorSnapshotCapture(t *testing.T) {
-	t.Parallel()
 	bp := `
 	cc_library {
 		name: "libvndk",
@@ -1093,7 +1080,6 @@
 }
 
 func TestVendorSnapshotUse(t *testing.T) {
-	t.Parallel()
 	frameworkBp := `
 	cc_library {
 		name: "libvndk",
@@ -1303,7 +1289,6 @@
 }
 
 func TestVendorSnapshotSanitizer(t *testing.T) {
-	t.Parallel()
 	bp := `
 	vendor_snapshot_static {
 		name: "libsnapshot",
@@ -1344,7 +1329,6 @@
 }
 
 func TestVendorSnapshotExclude(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that the exclude_from_vendor_snapshot property
 	// makes its way from the Android.bp source file into the module data
@@ -1452,7 +1436,6 @@
 }
 
 func TestVendorSnapshotExcludeInVendorProprietaryPathErrors(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that using the exclude_from_vendor_snapshot
 	// property on a module in a vendor proprietary path generates an
@@ -1493,7 +1476,6 @@
 }
 
 func TestVendorSnapshotExcludeWithVendorAvailable(t *testing.T) {
-	t.Parallel()
 
 	// This test verifies that using the exclude_from_vendor_snapshot
 	// property on a module that is vendor available generates an error. A
@@ -1537,7 +1519,6 @@
 }
 
 func TestDoubleLoadableDepError(t *testing.T) {
-	t.Parallel()
 	// Check whether an error is emitted when a LLNDK depends on a non-double_loadable VNDK lib.
 	testCcError(t, "module \".*\" variant \".*\": link.* \".*\" which is not LL-NDK, VNDK-SP, .*double_loadable", `
 		cc_library {
@@ -1658,7 +1639,6 @@
 }
 
 func TestVndkExt(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties.
 	bp := `
 		cc_library {
@@ -1741,7 +1721,6 @@
 }
 
 func TestVndkExtWithoutBoardVndkVersion(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties when BOARD_VNDK_VERSION is not set.
 	ctx := testCcNoVndk(t, `
 		cc_library {
@@ -1772,7 +1751,6 @@
 }
 
 func TestVndkExtWithoutProductVndkVersion(t *testing.T) {
-	t.Parallel()
 	// This test checks the VNDK-Ext properties when PRODUCT_PRODUCT_VNDK_VERSION is not set.
 	ctx := testCc(t, `
 		cc_library {
@@ -1803,7 +1781,6 @@
 }
 
 func TestVndkExtError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted in ill-formed vndk-ext definition.
 	testCcError(t, "must set `vendor: true` or `product_specific: true` to set `extends: \".*\"`", `
 		cc_library {
@@ -1889,7 +1866,6 @@
 }
 
 func TestVndkExtInconsistentSupportSystemProcessError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted for inconsistent support_system_process.
 	testCcError(t, "module \".*\" with mismatched support_system_process", `
 		cc_library {
@@ -1937,7 +1913,6 @@
 }
 
 func TestVndkExtVendorAvailableFalseError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted when a VNDK-Ext library extends a VNDK library
 	// with `vendor_available: false`.
 	testCcError(t, "`extends` refers module \".*\" which does not have `vendor_available: true`", `
@@ -1984,7 +1959,6 @@
 }
 
 func TestVendorModuleUseVndkExt(t *testing.T) {
-	t.Parallel()
 	// This test ensures a vendor module can depend on a VNDK-Ext library.
 	testCc(t, `
 		cc_library {
@@ -2037,7 +2011,6 @@
 }
 
 func TestVndkExtUseVendorLib(t *testing.T) {
-	t.Parallel()
 	// This test ensures a VNDK-Ext library can depend on a vendor library.
 	testCc(t, `
 		cc_library {
@@ -2100,7 +2073,6 @@
 }
 
 func TestProductVndkExtDependency(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -2166,7 +2138,6 @@
 }
 
 func TestVndkSpExtUseVndkError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted if a VNDK-SP-Ext library depends on a VNDK
 	// library.
 	testCcError(t, "module \".*\" variant \".*\": \\(.*\\) should not link to \".*\"", `
@@ -2249,7 +2220,6 @@
 }
 
 func TestVndkUseVndkExtError(t *testing.T) {
-	t.Parallel()
 	// This test ensures an error is emitted if a VNDK/VNDK-SP library depends on a
 	// VNDK-Ext/VNDK-SP-Ext library.
 	testCcError(t, "dependency \".*\" of \".*\" missing variant", `
@@ -2389,7 +2359,6 @@
 }
 
 func TestEnforceProductVndkVersion(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libllndk",
@@ -2464,7 +2433,6 @@
 }
 
 func TestEnforceProductVndkVersionErrors(t *testing.T) {
-	t.Parallel()
 	testCcErrorProductVndk(t, "dependency \".*\" of \".*\" missing variant:\n.*image:product.VER", `
 		cc_library {
 			name: "libprod",
@@ -2545,7 +2513,6 @@
 }
 
 func TestMakeLinkType(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libvndk",
@@ -2739,7 +2706,6 @@
 }
 
 func TestSplitListForSize(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range splitListForSizeTestCases {
 		out, _ := splitListForSize(android.PathsForTesting(testCase.in...), testCase.size)
 
@@ -2925,7 +2891,6 @@
 }
 
 func TestLinkReordering(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range staticLinkDepOrderTestCases {
 		errs := []string{}
 
@@ -2988,7 +2953,6 @@
 }
 
 func TestStaticLibDepReordering(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "a",
@@ -3027,7 +2991,6 @@
 }
 
 func TestStaticLibDepReorderingWithShared(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "a",
@@ -3074,7 +3037,6 @@
 }
 
 func TestLlndkLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library {
 		name: "libllndk",
@@ -3103,7 +3065,6 @@
 }
 
 func TestLlndkHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	llndk_headers {
 		name: "libllndk_headers",
@@ -3197,7 +3158,6 @@
 `
 
 func TestRuntimeLibs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, runtimeLibAndroidBp)
 
 	// runtime_libs for core variants use the module names without suffixes.
@@ -3221,7 +3181,6 @@
 }
 
 func TestExcludeRuntimeLibs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, runtimeLibAndroidBp)
 
 	variant := "android_arm64_armv8-a_shared"
@@ -3234,7 +3193,6 @@
 }
 
 func TestRuntimeLibsNoVndk(t *testing.T) {
-	t.Parallel()
 	ctx := testCcNoVndk(t, runtimeLibAndroidBp)
 
 	// If DeviceVndkVersion is not defined, then runtime_libs are copied as-is.
@@ -3272,7 +3230,6 @@
 `
 
 func TestStaticLibDepExport(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, staticLibAndroidBp)
 
 	// Check the shared version of lib2.
@@ -3360,7 +3317,6 @@
 }
 
 func TestCompilerFlags(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range compilerFlagsTestCases {
 		ctx := &mockContext{result: true}
 		CheckBadCompilerFlags(ctx, "", []string{testCase.in})
@@ -3374,7 +3330,6 @@
 }
 
 func TestVendorPublicLibraries(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library_headers {
 		name: "libvendorpublic_headers",
@@ -3441,7 +3396,6 @@
 }
 
 func TestRecovery(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library_shared {
 			name: "librecovery",
@@ -3477,7 +3431,6 @@
 }
 
 func TestDataLibsPrebuiltSharedTestLibrary(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_prebuilt_test_library_shared {
 			name: "test_lib",
@@ -3524,7 +3477,6 @@
 }
 
 func TestVersionedStubs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_library_shared {
 			name: "libFoo",
@@ -3589,7 +3541,6 @@
 }
 
 func TestVersioningMacro(t *testing.T) {
-	t.Parallel()
 	for _, tc := range []struct{ moduleName, expected string }{
 		{"libc", "__LIBC_API__"},
 		{"libfoo", "__LIBFOO_API__"},
@@ -3602,7 +3553,6 @@
 }
 
 func TestStaticExecutable(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_binary {
 			name: "static_test",
@@ -3628,7 +3578,6 @@
 }
 
 func TestStaticDepsOrderWithStubs(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_binary {
 			name: "mybin",
@@ -3669,7 +3618,6 @@
 }
 
 func TestErrorsIfAModuleDependsOnDisabled(t *testing.T) {
-	t.Parallel()
 	testCcError(t, `module "libA" .* depends on disabled module "libB"`, `
 		cc_library {
 			name: "libA",
@@ -3690,7 +3638,6 @@
 // Simple smoke test for the cc_fuzz target that ensures the rule compiles
 // correctly.
 func TestFuzzTarget(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_fuzz {
 			name: "fuzz_smoke_test",
@@ -3702,7 +3649,6 @@
 }
 
 func TestAidl(t *testing.T) {
-	t.Parallel()
 }
 
 func assertString(t *testing.T, got, expected string) {
@@ -3733,7 +3679,6 @@
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 		cc_defaults {
 			name: "defaults",
@@ -3798,7 +3743,6 @@
 }
 
 func TestProductVariableDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_defaults {
 			name: "libfoo_defaults",
diff --git a/cc/compiler_test.go b/cc/compiler_test.go
index cf553bd..c301388 100644
--- a/cc/compiler_test.go
+++ b/cc/compiler_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestIsThirdParty(t *testing.T) {
-	t.Parallel()
 	shouldFail := []string{
 		"external/foo/",
 		"vendor/bar/",
diff --git a/cc/config/tidy_test.go b/cc/config/tidy_test.go
index 3ea2f6b..4ed8b23 100644
--- a/cc/config/tidy_test.go
+++ b/cc/config/tidy_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestTidyChecksForDir(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		input    string
 		expected string
diff --git a/cc/gen_test.go b/cc/gen_test.go
index ee89873..4b9a36e 100644
--- a/cc/gen_test.go
+++ b/cc/gen_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestGen(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library_shared {
diff --git a/cc/genrule_test.go b/cc/genrule_test.go
index 6623d20..a366f76 100644
--- a/cc/genrule_test.go
+++ b/cc/genrule_test.go
@@ -30,7 +30,6 @@
 }
 
 func TestArchGenruleCmd(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"tool": nil,
 		"foo":  nil,
@@ -79,7 +78,6 @@
 }
 
 func TestLibraryGenruleCmd(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libboth",
diff --git a/cc/library_headers_test.go b/cc/library_headers_test.go
index db42d25..564ef61 100644
--- a/cc/library_headers_test.go
+++ b/cc/library_headers_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestLibraryHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_library_headers {
 		name: "headers",
@@ -42,7 +41,6 @@
 }
 
 func TestPrebuiltLibraryHeaders(t *testing.T) {
-	t.Parallel()
 	ctx := testCc(t, `
 	cc_prebuilt_library_headers {
 		name: "headers",
diff --git a/cc/library_test.go b/cc/library_test.go
index d42f073..49838b4 100644
--- a/cc/library_test.go
+++ b/cc/library_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestLibraryReuse(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library {
@@ -191,7 +190,6 @@
 }
 
 func TestStubsVersions(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",
@@ -215,7 +213,6 @@
 }
 
 func TestStubsVersions_NotSorted(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",
@@ -231,7 +228,6 @@
 }
 
 func TestStubsVersions_ParseError(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libfoo",
diff --git a/cc/object_test.go b/cc/object_test.go
index a006044..6ff8a00 100644
--- a/cc/object_test.go
+++ b/cc/object_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestLinkerScript(t *testing.T) {
-	t.Parallel()
 	t.Run("script", func(t *testing.T) {
 		testCc(t, `
 		cc_object {
diff --git a/cc/prebuilt_test.go b/cc/prebuilt_test.go
index afae261..52416ac 100644
--- a/cc/prebuilt_test.go
+++ b/cc/prebuilt_test.go
@@ -43,7 +43,6 @@
 }
 
 func TestPrebuilt(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "liba",
@@ -173,7 +172,6 @@
 }
 
 func TestPrebuiltLibraryShared(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_shared {
 		name: "libtest",
@@ -191,7 +189,6 @@
 }
 
 func TestPrebuiltLibraryStatic(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_static {
 		name: "libtest",
@@ -206,7 +203,6 @@
 }
 
 func TestPrebuiltLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library {
 		name: "libtest",
@@ -233,7 +229,6 @@
 }
 
 func TestPrebuiltLibraryStem(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library {
 		name: "libfoo",
@@ -261,7 +256,6 @@
 }
 
 func TestPrebuiltLibrarySharedStem(t *testing.T) {
-	t.Parallel()
 	ctx := testPrebuilt(t, `
 	cc_prebuilt_library_shared {
 		name: "libfoo",
@@ -280,7 +274,6 @@
 }
 
 func TestPrebuiltSymlinkedHostBinary(t *testing.T) {
-	t.Parallel()
 	if android.BuildOs != android.Linux {
 		t.Skipf("Skipping host prebuilt testing that is only supported on %s not %s", android.Linux, android.BuildOs)
 	}
diff --git a/cc/proto_test.go b/cc/proto_test.go
index 2d059eb..f8bbd26 100644
--- a/cc/proto_test.go
+++ b/cc/proto_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestProto(t *testing.T) {
-	t.Parallel()
 	t.Run("simple", func(t *testing.T) {
 		ctx := testCc(t, `
 		cc_library_shared {
diff --git a/cc/sdk_test.go b/cc/sdk_test.go
index 7b9867c..5a3c181 100644
--- a/cc/sdk_test.go
+++ b/cc/sdk_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestSdkMutator(t *testing.T) {
-	t.Parallel()
 	bp := `
 		cc_library {
 			name: "libsdk",
diff --git a/cc/test_data_test.go b/cc/test_data_test.go
index 7908aa0..ae59e2f 100644
--- a/cc/test_data_test.go
+++ b/cc/test_data_test.go
@@ -109,7 +109,6 @@
 }
 
 func TestDataTests(t *testing.T) {
-	t.Parallel()
 	buildDir, err := ioutil.TempDir("", "soong_test_test")
 	if err != nil {
 		t.Fatal(err)
diff --git a/cmd/diff_target_files/allow_list_test.go b/cmd/diff_target_files/allow_list_test.go
index 9f89657..8410e5a 100644
--- a/cmd/diff_target_files/allow_list_test.go
+++ b/cmd/diff_target_files/allow_list_test.go
@@ -58,7 +58,6 @@
 var f2 = bytesToZipArtifactFile("dir/f2", nil)
 
 func Test_applyAllowLists(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		diff       zipDiff
 		allowLists []allowList
diff --git a/cmd/diff_target_files/compare_test.go b/cmd/diff_target_files/compare_test.go
index 7621246..9d3f8a5 100644
--- a/cmd/diff_target_files/compare_test.go
+++ b/cmd/diff_target_files/compare_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestDiffTargetFilesLists(t *testing.T) {
-	t.Parallel()
 	zipArtifactFile := func(name string, crc32 uint32, size uint64) *ZipArtifactFile {
 		return &ZipArtifactFile{
 			File: &zip.File{
diff --git a/cmd/diff_target_files/glob_test.go b/cmd/diff_target_files/glob_test.go
index f2c6c6a..63df68d 100644
--- a/cmd/diff_target_files/glob_test.go
+++ b/cmd/diff_target_files/glob_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestMatch(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		pattern, name string
 		match         bool
diff --git a/cmd/extract_apks/main_test.go b/cmd/extract_apks/main_test.go
index 40f3882..c3e6a2d 100644
--- a/cmd/extract_apks/main_test.go
+++ b/cmd/extract_apks/main_test.go
@@ -37,7 +37,6 @@
 }
 
 func TestSelectApks_ApkSet(t *testing.T) {
-	t.Parallel()
 	testCases := []testDesc{
 		{
 			protoText: `
@@ -267,7 +266,6 @@
 }
 
 func TestSelectApks_ApexSet(t *testing.T) {
-	t.Parallel()
 	testCases := []testDesc{
 		{
 			protoText: `
@@ -444,7 +442,6 @@
 }
 
 func TestWriteApks(t *testing.T) {
-	t.Parallel()
 	testCases := []testCaseWriteApks{
 		{
 			name:       "splits",
diff --git a/cmd/extract_linker/main_test.go b/cmd/extract_linker/main_test.go
index 4e1ed02..6ac4ec6 100644
--- a/cmd/extract_linker/main_test.go
+++ b/cmd/extract_linker/main_test.go
@@ -51,7 +51,6 @@
 }
 
 func TestBytesToAsm(t *testing.T) {
-	t.Parallel()
 	for _, testcase := range bytesToAsmTestCases {
 		t.Run(testcase.name, func(t *testing.T) {
 			buf := bytes.Buffer{}
diff --git a/cmd/host_bionic_inject/host_bionic_inject_test.go b/cmd/host_bionic_inject/host_bionic_inject_test.go
index ef5120b..b415b34 100644
--- a/cmd/host_bionic_inject/host_bionic_inject_test.go
+++ b/cmd/host_bionic_inject/host_bionic_inject_test.go
@@ -100,7 +100,6 @@
 }
 
 func TestCheckLinker(t *testing.T) {
-	t.Parallel()
 	cases := []struct {
 		name   string
 		err    error
diff --git a/cmd/javac_wrapper/javac_wrapper_test.go b/cmd/javac_wrapper/javac_wrapper_test.go
index a1812fb..ad23001 100644
--- a/cmd/javac_wrapper/javac_wrapper_test.go
+++ b/cmd/javac_wrapper/javac_wrapper_test.go
@@ -93,7 +93,6 @@
 }
 
 func TestJavacColorize(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		t.Run(strconv.Itoa(i), func(t *testing.T) {
 			buf := new(bytes.Buffer)
@@ -111,7 +110,6 @@
 }
 
 func TestSubprocess(t *testing.T) {
-	t.Parallel()
 	t.Run("failure", func(t *testing.T) {
 		exitCode, err := Main(ioutil.Discard, "test", []string{"sh", "-c", "exit 9"})
 		if err != nil {
diff --git a/cmd/merge_zips/merge_zips_test.go b/cmd/merge_zips/merge_zips_test.go
index 78ffb76..cb58436 100644
--- a/cmd/merge_zips/merge_zips_test.go
+++ b/cmd/merge_zips/merge_zips_test.go
@@ -85,7 +85,6 @@
 }
 
 func TestMergeZips(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name             string
 		in               [][]testZipEntry
@@ -362,7 +361,6 @@
 }
 
 func TestInputZipsManager(t *testing.T) {
-	t.Parallel()
 	const nInputZips = 20
 	const nMaxOpenZips = 10
 	izm := NewInputZipsManager(20, 10)
diff --git a/cmd/multiproduct_kati/main_test.go b/cmd/multiproduct_kati/main_test.go
index e3ddfd7..263a124 100644
--- a/cmd/multiproduct_kati/main_test.go
+++ b/cmd/multiproduct_kati/main_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestSplitList(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		inputCount int
 		shardCount int
diff --git a/cmd/path_interposer/main_test.go b/cmd/path_interposer/main_test.go
index 3f1a5e1..c89d623 100644
--- a/cmd/path_interposer/main_test.go
+++ b/cmd/path_interposer/main_test.go
@@ -61,7 +61,6 @@
 }
 
 func TestInterposer(t *testing.T) {
-	t.Parallel()
 	interposer := setup(t)
 
 	logConfig := func(name string) paths.PathConfig {
@@ -181,7 +180,6 @@
 }
 
 func TestMissingPath(t *testing.T) {
-	t.Parallel()
 	interposer := setup(t)
 	err := os.Remove(interposer + "_origpath")
 	if err != nil {
diff --git a/cmd/soong_build/bazel_overlay_test.go b/cmd/soong_build/bazel_overlay_test.go
index ceb342f..f0c8515 100644
--- a/cmd/soong_build/bazel_overlay_test.go
+++ b/cmd/soong_build/bazel_overlay_test.go
@@ -64,7 +64,6 @@
 }
 
 func TestGenerateBazelOverlayFromBlueprint(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		bp                  string
 		expectedBazelTarget string
diff --git a/cmd/zip2zip/zip2zip_test.go b/cmd/zip2zip/zip2zip_test.go
index e6ac0bf..2c4e005 100644
--- a/cmd/zip2zip/zip2zip_test.go
+++ b/cmd/zip2zip/zip2zip_test.go
@@ -416,7 +416,6 @@
 }
 
 func TestZip2Zip(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range testCases {
 		t.Run(testCase.name, func(t *testing.T) {
 			inputBuf := &bytes.Buffer{}
@@ -473,7 +472,6 @@
 }
 
 func TestConstantPartOfPattern(t *testing.T) {
-	t.Parallel()
 	testCases := []struct{ in, out string }{
 		{
 			in:  "",
diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go
index 1fbd7f1..ec31549 100644
--- a/dexpreopt/dexpreopt_test.go
+++ b/dexpreopt/dexpreopt_test.go
@@ -61,7 +61,6 @@
 }
 
 func TestDexPreopt(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)
@@ -84,7 +83,6 @@
 }
 
 func TestDexPreoptSystemOther(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)
@@ -145,7 +143,6 @@
 }
 
 func TestDexPreoptProfile(t *testing.T) {
-	t.Parallel()
 	config := android.TestConfig("out", nil, "", nil)
 	ctx := android.PathContextForTesting(config)
 	globalSoong := GlobalSoongConfigForTests(config)
diff --git a/etc/prebuilt_etc_test.go b/etc/prebuilt_etc_test.go
index 528c484..8fc36c2 100644
--- a/etc/prebuilt_etc_test.go
+++ b/etc/prebuilt_etc_test.go
@@ -102,7 +102,6 @@
 	t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
 }
 func TestPrebuiltEtcVariants(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -137,7 +136,6 @@
 }
 
 func TestPrebuiltEtcOutputPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -153,7 +151,6 @@
 }
 
 func TestPrebuiltEtcGlob(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "my_foo",
@@ -178,7 +175,6 @@
 }
 
 func TestPrebuiltEtcAndroidMk(t *testing.T) {
-	t.Parallel()
 	ctx, config := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo",
@@ -215,7 +211,6 @@
 }
 
 func TestPrebuiltEtcRelativeInstallPathInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -232,7 +227,6 @@
 }
 
 func TestPrebuiltEtcCannotSetRelativeInstallPathAndSubDir(t *testing.T) {
-	t.Parallel()
 	testPrebuiltEtcError(t, "relative_install_path is set. Cannot set sub_dir", `
 		prebuilt_etc {
 			name: "foo.conf",
@@ -244,7 +238,6 @@
 }
 
 func TestPrebuiltEtcHost(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_etc_host {
 			name: "foo.conf",
@@ -260,7 +253,6 @@
 }
 
 func TestPrebuiltUserShareInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_usr_share {
 			name: "foo.conf",
@@ -277,7 +269,6 @@
 }
 
 func TestPrebuiltUserShareHostInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, config := testPrebuiltEtc(t, `
 		prebuilt_usr_share_host {
 			name: "foo.conf",
@@ -295,7 +286,6 @@
 }
 
 func TestPrebuiltFontInstallDirPath(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testPrebuiltEtc(t, `
 		prebuilt_font {
 			name: "foo.conf",
@@ -311,7 +301,6 @@
 }
 
 func TestPrebuiltFirmwareDirPath(t *testing.T) {
-	t.Parallel()
 	targetPath := buildDir + "/target/product/test_device"
 	tests := []struct {
 		description  string
@@ -348,7 +337,6 @@
 }
 
 func TestPrebuiltDSPDirPath(t *testing.T) {
-	t.Parallel()
 	targetPath := filepath.Join(buildDir, "/target/product/test_device")
 	tests := []struct {
 		description  string
diff --git a/finder/finder_test.go b/finder/finder_test.go
index 029c80f..88b0c05 100644
--- a/finder/finder_test.go
+++ b/finder/finder_test.go
@@ -122,7 +122,6 @@
 // end of utils, start of individual tests
 
 func TestSingleFile(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt"},
 		[]string{"findme.txt"},
@@ -130,7 +129,6 @@
 }
 
 func TestIncludeFiles(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt", "skipme.txt"},
 		[]string{"findme.txt"},
@@ -138,7 +136,6 @@
 }
 
 func TestNestedDirectories(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{"findme.txt", "skipme.txt", "subdir/findme.txt", "subdir/skipme.txt"},
 		[]string{"findme.txt", "subdir/findme.txt"},
@@ -146,7 +143,6 @@
 }
 
 func TestEmptyDirectory(t *testing.T) {
-	t.Parallel()
 	runSimpleTest(t,
 		[]string{},
 		[]string{},
@@ -154,7 +150,6 @@
 }
 
 func TestEmptyPath(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	root := "/tmp"
 	fs.Create(t, filepath.Join(root, "findme.txt"), filesystem)
@@ -175,7 +170,6 @@
 }
 
 func TestFilesystemRoot(t *testing.T) {
-	t.Parallel()
 
 	testWithNumThreads := func(t *testing.T, numThreads int) {
 		filesystem := newFs()
@@ -203,7 +197,6 @@
 }
 
 func TestNonexistentDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
 
@@ -222,7 +215,6 @@
 }
 
 func TestExcludeDirs(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/exclude/findme.txt", filesystem)
 	fs.Create(t, "/tmp/exclude/subdir/findme.txt", filesystem)
@@ -251,7 +243,6 @@
 }
 
 func TestPruneFiles(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/out/findme.txt", filesystem)
 	fs.Create(t, "/tmp/out/.ignore-out-dir", filesystem)
@@ -284,7 +275,6 @@
 // TestRootDir tests that the value of RootDirs is used
 // tests of the filesystem root are in TestFilesystemRoot
 func TestRootDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
 	fs.Create(t, "/tmp/a/subdir/findme.txt", filesystem)
@@ -309,7 +299,6 @@
 }
 
 func TestUncachedDir(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
 	fs.Create(t, "/tmp/a/subdir/findme.txt", filesystem)
@@ -337,7 +326,6 @@
 }
 
 func TestSearchingForFilesExcludedFromCache(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -365,7 +353,6 @@
 }
 
 func TestRelativeFilePaths(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/ignore/hi.txt", filesystem)
@@ -410,7 +397,6 @@
 // have to run this test with the race-detector (`go test -race src/android/soong/finder/*.go`)
 // for there to be much chance of the test actually detecting any error that may be present
 func TestRootDirsContainedInOtherRootDirs(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/a/b/c/d/e/f/g/h/i/j/findme.txt", filesystem)
@@ -432,7 +418,6 @@
 }
 
 func TestFindFirst(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
 	fs.Create(t, "/tmp/b/hi.txt", filesystem)
@@ -457,7 +442,6 @@
 }
 
 func TestConcurrentFindSameDirectory(t *testing.T) {
-	t.Parallel()
 
 	testWithNumThreads := func(t *testing.T, numThreads int) {
 		filesystem := newFs()
@@ -509,7 +493,6 @@
 }
 
 func TestConcurrentFindDifferentDirectories(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	// create a bunch of files and directories
@@ -573,7 +556,6 @@
 }
 
 func TestStrangelyFormattedPaths(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -599,7 +581,6 @@
 }
 
 func TestCorruptedCacheHeader(t *testing.T) {
-	t.Parallel()
 	filesystem := newFs()
 
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -624,7 +605,6 @@
 }
 
 func TestCanUseCache(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -671,7 +651,6 @@
 }
 
 func TestCorruptedCacheBody(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -736,7 +715,6 @@
 }
 
 func TestStatCalls(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/findme.txt", filesystem)
@@ -760,7 +738,6 @@
 }
 
 func TestFileAdded(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -803,7 +780,6 @@
 }
 
 func TestDirectoriesAdded(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -848,7 +824,6 @@
 }
 
 func TestDirectoryAndSubdirectoryBothUpdated(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi1.txt", filesystem)
@@ -889,7 +864,6 @@
 }
 
 func TestFileDeleted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/ignoreme.txt", filesystem)
@@ -930,7 +904,6 @@
 }
 
 func TestDirectoriesDeleted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -986,7 +959,6 @@
 }
 
 func TestDirectoriesMoved(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1045,7 +1017,6 @@
 }
 
 func TestDirectoriesSwapped(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1161,7 +1132,6 @@
 }
 
 func TestChangeOfDevice(t *testing.T) {
-	t.Parallel()
 	fs1 := newFs()
 	// not as fine-grained mounting controls as a real filesystem, but should be adequate
 	fs1.SetDeviceNumber(0)
@@ -1173,7 +1143,6 @@
 }
 
 func TestChangeOfUserOrHost(t *testing.T) {
-	t.Parallel()
 	fs1 := newFs()
 	fs1.SetViewId("me@here")
 
@@ -1184,7 +1153,6 @@
 }
 
 func TestConsistentCacheOrdering(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	for i := 0; i < 5; i++ {
@@ -1237,7 +1205,6 @@
 }
 
 func TestNumSyscallsOfSecondFind(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1268,7 +1235,6 @@
 }
 
 func TestChangingParamsOfSecondFind(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/findme.txt", filesystem)
@@ -1299,7 +1265,6 @@
 }
 
 func TestSymlinkPointingToFile(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
@@ -1336,7 +1301,6 @@
 }
 
 func TestSymlinkPointingToDirectory(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/dir/hi.txt", filesystem)
@@ -1371,7 +1335,6 @@
 // TestAddPruneFile confirms that adding a prune-file (into a directory for which we
 // already had a cache) causes the directory to be ignored
 func TestAddPruneFile(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/out/hi.txt", filesystem)
@@ -1410,7 +1373,6 @@
 }
 
 func TestUpdatingDbIffChanged(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
@@ -1470,7 +1432,6 @@
 }
 
 func TestDirectoryNotPermitted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi.txt", filesystem)
@@ -1519,7 +1480,6 @@
 }
 
 func TestFileNotPermitted(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/hi.txt", filesystem)
@@ -1542,7 +1502,6 @@
 }
 
 func TestCacheEntryPathUnexpectedError(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := newFs()
 	fs.Create(t, "/tmp/a/hi.txt", filesystem)
diff --git a/finder/fs/fs_test.go b/finder/fs/fs_test.go
index 5671bcf..22a4d7a 100644
--- a/finder/fs/fs_test.go
+++ b/finder/fs/fs_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestMockFs_LstatStatSymlinks(t *testing.T) {
-	t.Parallel()
 	// setup filesystem
 	filesystem := NewMockFs(nil)
 	Create(t, "/tmp/realdir/hi.txt", filesystem)
diff --git a/finder/fs/readdir_test.go b/finder/fs/readdir_test.go
index d133bba..24a6d18 100644
--- a/finder/fs/readdir_test.go
+++ b/finder/fs/readdir_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestParseDirent(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name string
 		in   []byte
diff --git a/genrule/genrule_test.go b/genrule/genrule_test.go
index a7af4db..c692019 100644
--- a/genrule/genrule_test.go
+++ b/genrule/genrule_test.go
@@ -125,7 +125,6 @@
 }
 
 func TestGenruleCmd(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name string
 		prop string
@@ -504,7 +503,6 @@
 }
 
 func TestGenruleHashInputs(t *testing.T) {
-	t.Parallel()
 
 	// The basic idea here is to verify that the sbox command (which is
 	// in the Command field of the generate rule) contains a hash of the
@@ -592,7 +590,6 @@
 }
 
 func TestGenSrcs(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		name string
 		prop string
@@ -685,7 +682,6 @@
 }
 
 func TestGenruleDefaults(t *testing.T) {
-	t.Parallel()
 	bp := `
 				genrule_defaults {
 					name: "gen_defaults1",
diff --git a/jar/jar_test.go b/jar/jar_test.go
index f1c799b..c92011e 100644
--- a/jar/jar_test.go
+++ b/jar/jar_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestGetJavaPackage(t *testing.T) {
-	t.Parallel()
 	type args struct {
 		r   io.Reader
 		src string
@@ -79,7 +78,6 @@
 }
 
 func Test_javaIdentRune(t *testing.T) {
-	t.Parallel()
 	// runes that should be valid anywhere in an identifier
 	validAnywhere := []rune{
 		// letters, $, _
diff --git a/java/androidmk_test.go b/java/androidmk_test.go
index 359d8d7..075b7aa 100644
--- a/java/androidmk_test.go
+++ b/java/androidmk_test.go
@@ -23,7 +23,6 @@
 )
 
 func TestRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -43,7 +42,6 @@
 }
 
 func TestHostdex(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -74,7 +72,6 @@
 }
 
 func TestHostdexRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -106,7 +103,6 @@
 }
 
 func TestHostdexSpecificRequired(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -140,7 +136,6 @@
 }
 
 func TestDistWithTag(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo_without_tag",
@@ -177,7 +172,6 @@
 }
 
 func TestDistWithDest(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -214,7 +208,6 @@
 }
 
 func TestDistsWithAllProperties(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo",
@@ -272,7 +265,6 @@
 }
 
 func TestDistsWithTag(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_library {
 			name: "foo_without_tag",
@@ -320,7 +312,6 @@
 }
 
 func TestJavaSdkLibrary_RequireXmlPermissionFile(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_sdk_library {
 			name: "foo-shared_library",
diff --git a/java/app_test.go b/java/app_test.go
index f894379..31b422c 100644
--- a/java/app_test.go
+++ b/java/app_test.go
@@ -67,7 +67,6 @@
 }
 
 func TestApp(t *testing.T) {
-	t.Parallel()
 	for _, moduleType := range []string{"android_app", "android_library"} {
 		t.Run(moduleType, func(t *testing.T) {
 			ctx := testApp(t, moduleType+` {
@@ -114,7 +113,6 @@
 }
 
 func TestAppSplits(t *testing.T) {
-	t.Parallel()
 	ctx := testApp(t, `
 				android_app {
 					name: "foo",
@@ -144,7 +142,6 @@
 }
 
 func TestAndroidAppSet(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		android_app_set {
 			name: "foo",
@@ -173,7 +170,6 @@
 }
 
 func TestAndroidAppSet_Variants(t *testing.T) {
-	t.Parallel()
 	bp := `
 		android_app_set {
 			name: "foo",
@@ -239,7 +235,6 @@
 }
 
 func TestPlatformAPIs(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		android_app {
 			name: "foo",
@@ -274,7 +269,6 @@
 }
 
 func TestAndroidAppLinkType(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		android_app {
 			name: "foo",
@@ -364,7 +358,6 @@
 }
 
 func TestUpdatableApps(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name          string
 		bp            string
@@ -486,7 +479,6 @@
 }
 
 func TestUpdatableApps_TransitiveDepsShouldSetMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, `module "bar".*: should support min_sdk_version\(29\)`, cc.GatherRequiredDepsForTest(android.Android)+`
 		android_app {
 			name: "foo",
@@ -505,7 +497,6 @@
 }
 
 func TestUpdatableApps_JniLibsShouldShouldSupportMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		android_app {
 			name: "foo",
@@ -526,7 +517,6 @@
 }
 
 func TestUpdatableApps_JniLibShouldBeBuiltAgainstMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	bp := cc.GatherRequiredDepsForTest(android.Android) + `
 		android_app {
 			name: "foo",
@@ -581,7 +571,6 @@
 }
 
 func TestUpdatableApps_ErrorIfJniLibDoesntSupportMinSdkVersion(t *testing.T) {
-	t.Parallel()
 	bp := cc.GatherRequiredDepsForTest(android.Android) + `
 		android_app {
 			name: "foo",
@@ -602,7 +591,6 @@
 }
 
 func TestUpdatableApps_ErrorIfDepSdkVersionIsHigher(t *testing.T) {
-	t.Parallel()
 	bp := cc.GatherRequiredDepsForTest(android.Android) + `
 		android_app {
 			name: "foo",
@@ -632,7 +620,6 @@
 }
 
 func TestResourceDirs(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name      string
 		prop      string
@@ -692,7 +679,6 @@
 }
 
 func TestLibraryAssets(t *testing.T) {
-	t.Parallel()
 	bp := `
 			android_app {
 				name: "foo",
@@ -794,7 +780,6 @@
 }
 
 func TestAndroidResources(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name                       string
 		enforceRROTargets          []string
@@ -1085,7 +1070,6 @@
 }
 
 func TestAppSdkVersion(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name                  string
 		sdkVersion            string
@@ -1168,7 +1152,6 @@
 }
 
 func TestVendorAppSdkVersion(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name                                  string
 		sdkVersion                            string
@@ -1232,7 +1215,6 @@
 }
 
 func TestJNIABI(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		cc_library {
 			name: "libjni",
@@ -1307,7 +1289,6 @@
 }
 
 func TestAppSdkVersionByPartition(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, "sdk_version must have a value when the module is located at vendor or product", `
 		android_app {
 			name: "foo",
@@ -1346,7 +1327,6 @@
 }
 
 func TestJNIPackaging(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		cc_library {
 			name: "libjni",
@@ -1438,7 +1418,6 @@
 }
 
 func TestJNISDK(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		cc_library {
 			name: "libjni",
@@ -1556,7 +1535,6 @@
 }
 
 func TestCertificates(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name                string
 		bp                  string
@@ -1677,7 +1655,6 @@
 }
 
 func TestRequestV4SigningFlag(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name     string
 		bp       string
@@ -1738,7 +1715,6 @@
 }
 
 func TestPackageNameOverride(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name                string
 		bp                  string
@@ -1804,7 +1780,6 @@
 }
 
 func TestInstrumentationTargetOverridden(t *testing.T) {
-	t.Parallel()
 	bp := `
 		android_app {
 			name: "foo",
@@ -1834,7 +1809,6 @@
 }
 
 func TestOverrideAndroidApp(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app {
 			name: "foo",
@@ -2036,7 +2010,6 @@
 }
 
 func TestOverrideAndroidAppDependency(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app {
 			name: "foo",
@@ -2079,7 +2052,6 @@
 }
 
 func TestOverrideAndroidTest(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app {
 			name: "foo",
@@ -2176,7 +2148,6 @@
 }
 
 func TestAndroidTest_FixTestConfig(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app {
 			name: "foo",
@@ -2258,7 +2229,6 @@
 }
 
 func TestAndroidAppImport(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app_import {
 			name: "foo",
@@ -2288,7 +2258,6 @@
 }
 
 func TestAndroidAppImport_NoDexPreopt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app_import {
 			name: "foo",
@@ -2310,7 +2279,6 @@
 }
 
 func TestAndroidAppImport_Presigned(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app_import {
 			name: "foo",
@@ -2339,7 +2307,6 @@
 }
 
 func TestAndroidAppImport_SigningLineage(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 	  android_app_import {
 			name: "foo",
@@ -2361,7 +2328,6 @@
 }
 
 func TestAndroidAppImport_DefaultDevCert(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_app_import {
 			name: "foo",
@@ -2391,7 +2357,6 @@
 }
 
 func TestAndroidAppImport_DpiVariants(t *testing.T) {
-	t.Parallel()
 	bp := `
 		android_app_import {
 			name: "foo",
@@ -2470,7 +2435,6 @@
 }
 
 func TestAndroidAppImport_Filename(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		android_app_import {
 			name: "foo",
@@ -2518,7 +2482,6 @@
 }
 
 func TestAndroidAppImport_ArchVariants(t *testing.T) {
-	t.Parallel()
 	// The test config's target arch is ARM64.
 	testCases := []struct {
 		name     string
@@ -2582,7 +2545,6 @@
 }
 
 func TestAndroidTestImport(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		android_test_import {
 			name: "foo",
@@ -2611,7 +2573,6 @@
 }
 
 func TestAndroidTestImport_NoJinUncompressForPresigned(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_test_import {
 			name: "foo",
@@ -2649,7 +2610,6 @@
 }
 
 func TestAndroidTestImport_Preprocessed(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		android_test_import {
 			name: "foo",
@@ -2686,7 +2646,6 @@
 }
 
 func TestStl(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		cc_library {
 			name: "libjni",
@@ -2750,7 +2709,6 @@
 }
 
 func TestUsesLibraries(t *testing.T) {
-	t.Parallel()
 	bp := `
 		java_sdk_library {
 			name: "foo",
@@ -2875,7 +2833,6 @@
 }
 
 func TestCodelessApp(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		bp     string
@@ -2952,7 +2909,6 @@
 }
 
 func TestEmbedNotice(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJavaWithFS(t, cc.GatherRequiredDepsForTest(android.Android)+`
 		android_app {
 			name: "foo",
@@ -3062,7 +3018,6 @@
 }
 
 func TestUncompressDex(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name string
 		bp   string
@@ -3190,7 +3145,6 @@
 }
 
 func TestRuntimeResourceOverlay(t *testing.T) {
-	t.Parallel()
 	fs := map[string][]byte{
 		"baz/res/res/values/strings.xml": nil,
 		"bar/res/res/values/strings.xml": nil,
@@ -3295,7 +3249,6 @@
 }
 
 func TestRuntimeResourceOverlay_JavaDefaults(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_defaults {
 			name: "rro_defaults",
@@ -3355,7 +3308,6 @@
 }
 
 func TestOverrideRuntimeResourceOverlay(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		runtime_resource_overlay {
 			name: "foo_overlay",
diff --git a/java/device_host_converter_test.go b/java/device_host_converter_test.go
index 208ea57..3c9a0f3 100644
--- a/java/device_host_converter_test.go
+++ b/java/device_host_converter_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestDeviceForHost(t *testing.T) {
-	t.Parallel()
 	bp := `
 		java_library {
 			name: "device_module",
@@ -103,7 +102,6 @@
 }
 
 func TestHostForDevice(t *testing.T) {
-	t.Parallel()
 	bp := `
 		java_library_host {
 			name: "host_module",
diff --git a/java/dexpreopt_bootjars_test.go b/java/dexpreopt_bootjars_test.go
index 00bd80c..4a8d3cd 100644
--- a/java/dexpreopt_bootjars_test.go
+++ b/java/dexpreopt_bootjars_test.go
@@ -84,7 +84,6 @@
 }
 
 func TestDexpreoptBootJars(t *testing.T) {
-	t.Parallel()
 	ruleFile := "boot-foo.art"
 
 	expectedInputs := []string{
@@ -115,7 +114,6 @@
 
 // Changes to the boot.zip structure may break the ART APK scanner.
 func TestDexpreoptBootZip(t *testing.T) {
-	t.Parallel()
 	ruleFile := "boot.zip"
 
 	ctx := android.PathContextForTesting(testConfig(nil, "", nil))
diff --git a/java/dexpreopt_test.go b/java/dexpreopt_test.go
index 0bb3ac9..5550a4c 100644
--- a/java/dexpreopt_test.go
+++ b/java/dexpreopt_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestDexpreoptEnabled(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name    string
 		bp      string
diff --git a/java/hiddenapi_singleton_test.go b/java/hiddenapi_singleton_test.go
index 97dd125..dbdab7a 100644
--- a/java/hiddenapi_singleton_test.go
+++ b/java/hiddenapi_singleton_test.go
@@ -58,7 +58,6 @@
 }
 
 func TestHiddenAPISingleton(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testHiddenAPIBootJars(t, `
 		java_library {
 			name: "foo",
@@ -76,7 +75,6 @@
 }
 
 func TestHiddenAPISingletonWithPrebuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testHiddenAPIBootJars(t, `
 		java_import {
 			name: "foo",
@@ -94,7 +92,6 @@
 }
 
 func TestHiddenAPISingletonWithPrebuiltUseSource(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testHiddenAPIBootJars(t, `
 		java_library {
 			name: "foo",
@@ -124,7 +121,6 @@
 }
 
 func TestHiddenAPISingletonWithPrebuiltOverrideSource(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testHiddenAPIBootJars(t, `
 		java_library {
 			name: "foo",
@@ -154,7 +150,6 @@
 }
 
 func TestHiddenAPISingletonSdks(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name             string
 		unbundledBuild   bool
diff --git a/java/jacoco_test.go b/java/jacoco_test.go
index d77c916..91f0553 100644
--- a/java/jacoco_test.go
+++ b/java/jacoco_test.go
@@ -17,7 +17,6 @@
 import "testing"
 
 func TestJacocoFilterToSpecs(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name, in, out string
 	}{
@@ -67,7 +66,6 @@
 }
 
 func TestJacocoFiltersToZipCommand(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name               string
 		includes, excludes []string
diff --git a/java/java_test.go b/java/java_test.go
index 245654d..a43e2a8 100644
--- a/java/java_test.go
+++ b/java/java_test.go
@@ -177,7 +177,6 @@
 }
 
 func TestJavaLinkType(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_library {
 			name: "foo",
@@ -266,7 +265,6 @@
 }
 
 func TestSimple(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -311,7 +309,6 @@
 }
 
 func TestExportedPlugins(t *testing.T) {
-	t.Parallel()
 	type Result struct {
 		library    string
 		processors string
@@ -395,7 +392,6 @@
 }
 
 func TestSdkVersionByPartition(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, "sdk_version must have a value when the module is located at vendor or product", `
 		java_library {
 			name: "foo",
@@ -431,7 +427,6 @@
 }
 
 func TestArchSpecific(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -451,7 +446,6 @@
 }
 
 func TestBinary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library_host {
 			name: "foo",
@@ -480,7 +474,6 @@
 }
 
 func TestHostBinaryNoJavaDebugInfoOverride(t *testing.T) {
-	t.Parallel()
 	bp := `
 		java_library {
 			name: "target_library",
@@ -516,7 +509,6 @@
 }
 
 func TestPrebuilts(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -612,7 +604,6 @@
 }
 
 func TestJavaSdkLibraryImport(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -669,7 +660,6 @@
 }
 
 func TestJavaSdkLibraryImport_WithSource(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_sdk_library {
 			name: "sdklib",
@@ -709,7 +699,6 @@
 }
 
 func TestJavaSdkLibraryImport_Preferred(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_sdk_library {
 			name: "sdklib",
@@ -747,7 +736,6 @@
 }
 
 func TestDefaults(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_defaults {
 			name: "defaults",
@@ -823,7 +811,6 @@
 }
 
 func TestResources(t *testing.T) {
-	t.Parallel()
 	var table = []struct {
 		name  string
 		prop  string
@@ -930,7 +917,6 @@
 }
 
 func TestIncludeSrcs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJavaWithFS(t, `
 		java_library {
 			name: "foo",
@@ -998,7 +984,6 @@
 }
 
 func TestGeneratedSources(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJavaWithFS(t, `
 		java_library {
 			name: "foo",
@@ -1035,7 +1020,6 @@
 }
 
 func TestTurbine(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -1085,7 +1069,6 @@
 }
 
 func TestSharding(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "bar",
@@ -1104,7 +1087,6 @@
 }
 
 func TestDroiddoc(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJavaWithFS(t, `
 		droiddoc_exported_dir {
 		    name: "droiddoc-templates-sdk",
@@ -1183,7 +1165,6 @@
 }
 
 func TestDroiddocArgsAndFlagsCausesError(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, "flags is set. Cannot set args", `
 		droiddoc_exported_dir {
 		    name: "droiddoc-templates-sdk",
@@ -1230,7 +1211,6 @@
 }
 
 func TestDroidstubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJavaWithFS(t, `
 		droiddoc_exported_dir {
 		    name: "droiddoc-templates-sdk",
@@ -1287,7 +1267,6 @@
 }
 
 func TestDroidstubsWithSystemModules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		droidstubs {
 		    name: "stubs-source-system-modules",
@@ -1347,7 +1326,6 @@
 }
 
 func TestJarGenrules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -1402,7 +1380,6 @@
 }
 
 func TestExcludeFileGroupInSrcs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -1429,7 +1406,6 @@
 }
 
 func TestJavaLibrary(t *testing.T) {
-	t.Parallel()
 	config := testConfig(nil, "", map[string][]byte{
 		"libcore/Android.bp": []byte(`
 				java_library {
@@ -1467,7 +1443,6 @@
 }
 
 func TestJavaSdkLibrary(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		droiddoc_exported_dir {
 			name: "droiddoc-templates-sdk",
@@ -1606,7 +1581,6 @@
 }
 
 func TestJavaSdkLibrary_DoNotAccessImplWhenItIsNotBuilt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1632,7 +1606,6 @@
 }
 
 func TestJavaSdkLibrary_UseSourcesFromAnotherSdkLibrary(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1651,7 +1624,6 @@
 }
 
 func TestJavaSdkLibrary_AccessOutputFiles_MissingScope(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, `"foo" does not provide api scope system`, `
 		java_sdk_library {
 			name: "foo",
@@ -1670,7 +1642,6 @@
 }
 
 func TestJavaSdkLibrary_Deps(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_sdk_library {
 			name: "sdklib",
@@ -1693,7 +1664,6 @@
 }
 
 func TestJavaSdkLibraryImport_AccessOutputFiles(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library_import {
 			name: "foo",
@@ -1717,7 +1687,6 @@
 }
 
 func TestJavaSdkLibraryImport_AccessOutputFiles_Invalid(t *testing.T) {
-	t.Parallel()
 	bp := `
 		java_sdk_library_import {
 			name: "foo",
@@ -1766,7 +1735,6 @@
 }
 
 func TestJavaSdkLibrary_InvalidScopes(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, `module "foo": enabled api scope "system" depends on disabled scope "public"`, `
 		java_sdk_library {
 			name: "foo",
@@ -1785,7 +1753,6 @@
 }
 
 func TestJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1800,7 +1767,6 @@
 }
 
 func TestJavaSdkLibrary_ModuleLib(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1817,7 +1783,6 @@
 }
 
 func TestJavaSdkLibrary_SystemServer(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1834,7 +1799,6 @@
 }
 
 func TestJavaSdkLibrary_MissingScope(t *testing.T) {
-	t.Parallel()
 	testJavaError(t, `requires api scope module-lib from foo but it only has \[\] available`, `
 		java_sdk_library {
 			name: "foo",
@@ -1854,7 +1818,6 @@
 }
 
 func TestJavaSdkLibrary_FallbackScope(t *testing.T) {
-	t.Parallel()
 	testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1875,7 +1838,6 @@
 }
 
 func TestJavaSdkLibrary_DefaultToStubs(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_sdk_library {
 			name: "foo",
@@ -1951,7 +1913,6 @@
 }
 
 func TestCompilerFlags(t *testing.T) {
-	t.Parallel()
 	for _, testCase := range compilerFlagsTestCases {
 		ctx := &mockContext{result: true}
 		CheckKotlincFlags(ctx, []string{testCase.in})
@@ -1982,7 +1943,6 @@
 }
 
 func TestPatchModule(t *testing.T) {
-	t.Parallel()
 	t.Run("Java language level 8", func(t *testing.T) {
 		// Test with legacy javac -source 1.8 -target 1.8
 		bp := `
@@ -2048,7 +2008,6 @@
 }
 
 func TestJavaSystemModules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_system_modules {
 			name: "system-modules",
@@ -2083,7 +2042,6 @@
 }
 
 func TestJavaSystemModulesImport(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_system_modules_import {
 			name: "system-modules",
@@ -2114,7 +2072,6 @@
 }
 
 func TestJavaLibraryWithSystemModules(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 		    name: "lib-with-source-system-modules",
@@ -2171,7 +2128,6 @@
 }
 
 func TestAidlExportIncludeDirsFromImports(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -2196,7 +2152,6 @@
 }
 
 func TestDataNativeBinaries(t *testing.T) {
-	t.Parallel()
 	ctx, config := testJava(t, `
 		java_test_host {
 			name: "foo",
diff --git a/java/jdeps_test.go b/java/jdeps_test.go
index 46e7296..874d1d7 100644
--- a/java/jdeps_test.go
+++ b/java/jdeps_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestCollectJavaLibraryPropertiesAddLibsDeps(t *testing.T) {
-	t.Parallel()
 	expected := []string{"Foo", "Bar"}
 	module := LibraryFactory().(*Library)
 	module.properties.Libs = append(module.properties.Libs, expected...)
@@ -36,7 +35,6 @@
 }
 
 func TestCollectJavaLibraryPropertiesAddStaticLibsDeps(t *testing.T) {
-	t.Parallel()
 	expected := []string{"Foo", "Bar"}
 	module := LibraryFactory().(*Library)
 	module.properties.Static_libs = append(module.properties.Static_libs, expected...)
@@ -50,7 +48,6 @@
 }
 
 func TestCollectJavaLibraryPropertiesAddScrs(t *testing.T) {
-	t.Parallel()
 	expected := []string{"Foo", "Bar"}
 	module := LibraryFactory().(*Library)
 	module.expandIDEInfoCompiledSrcs = append(module.expandIDEInfoCompiledSrcs, expected...)
@@ -64,7 +61,6 @@
 }
 
 func TestCollectJavaLibraryPropertiesAddAidlIncludeDirs(t *testing.T) {
-	t.Parallel()
 	expected := []string{"Foo", "Bar"}
 	module := LibraryFactory().(*Library)
 	module.deviceProperties.Aidl.Include_dirs = append(module.deviceProperties.Aidl.Include_dirs, expected...)
@@ -78,7 +74,6 @@
 }
 
 func TestCollectJavaLibraryPropertiesAddJarjarRules(t *testing.T) {
-	t.Parallel()
 	expected := "Jarjar_rules.txt"
 	module := LibraryFactory().(*Library)
 	module.expandJarjarRules = android.PathForTesting(expected)
diff --git a/java/kotlin_test.go b/java/kotlin_test.go
index 530f7fe..60ca1c4 100644
--- a/java/kotlin_test.go
+++ b/java/kotlin_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestKotlin(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -85,7 +84,6 @@
 }
 
 func TestKapt(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -165,7 +163,6 @@
 }
 
 func TestKaptEncodeFlags(t *testing.T) {
-	t.Parallel()
 	// Compares the kaptEncodeFlags against the results of the example implementation at
 	// https://kotlinlang.org/docs/reference/kapt.html#apjavac-options-encoding
 	tests := []struct {
diff --git a/java/plugin_test.go b/java/plugin_test.go
index 3eb0215..c7913d3 100644
--- a/java/plugin_test.go
+++ b/java/plugin_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestNoPlugin(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -45,7 +44,6 @@
 }
 
 func TestPlugin(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
@@ -85,7 +83,6 @@
 }
 
 func TestPluginGeneratesApi(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testJava(t, `
 		java_library {
 			name: "foo",
diff --git a/java/sdk_test.go b/java/sdk_test.go
index 374da11..776069d 100644
--- a/java/sdk_test.go
+++ b/java/sdk_test.go
@@ -27,7 +27,6 @@
 )
 
 func TestClasspath(t *testing.T) {
-	t.Parallel()
 	var classpathTestcases = []struct {
 		name       string
 		unbundled  bool
diff --git a/makedeps/deps_test.go b/makedeps/deps_test.go
index 17e77c4..ac2f699 100644
--- a/makedeps/deps_test.go
+++ b/makedeps/deps_test.go
@@ -23,7 +23,6 @@
 )
 
 func TestParse(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		input  string
@@ -340,7 +339,6 @@
 }
 
 func TestDepPrint(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name   string
 		input  Deps
diff --git a/partner/androidmk/androidmk_test.go b/partner/androidmk/androidmk_test.go
index 2a0ddc8..6bae836 100644
--- a/partner/androidmk/androidmk_test.go
+++ b/partner/androidmk/androidmk_test.go
@@ -54,7 +54,6 @@
 }
 
 func TestEndToEnd(t *testing.T) {
-	t.Parallel()
 	for i, test := range testCases {
 		expected, err := bpfix.Reformat(test.expected)
 		if err != nil {
diff --git a/python/python_test.go b/python/python_test.go
index 455d84a..23db24e 100644
--- a/python/python_test.go
+++ b/python/python_test.go
@@ -326,7 +326,6 @@
 )
 
 func TestPythonModule(t *testing.T) {
-	t.Parallel()
 	for _, d := range data {
 		t.Run(d.desc, func(t *testing.T) {
 			config := android.TestConfig(buildDir, nil, "", d.mockFiles)
diff --git a/remoteexec/remoteexec_test.go b/remoteexec/remoteexec_test.go
index 2fd3687..56985d3 100644
--- a/remoteexec/remoteexec_test.go
+++ b/remoteexec/remoteexec_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestTemplate(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name   string
 		params *REParams
@@ -68,7 +67,6 @@
 }
 
 func TestNoVarTemplate(t *testing.T) {
-	t.Parallel()
 	params := &REParams{
 		Labels:      map[string]string{"type": "compile", "lang": "cpp", "compiler": "clang"},
 		Inputs:      []string{"$in"},
@@ -85,7 +83,6 @@
 }
 
 func TestTemplateDeterminism(t *testing.T) {
-	t.Parallel()
 	r := &REParams{
 		Labels:      map[string]string{"type": "compile", "lang": "cpp", "compiler": "clang"},
 		Inputs:      []string{"$in"},
diff --git a/rust/binary_test.go b/rust/binary_test.go
index 692a066..b44a5bc 100644
--- a/rust/binary_test.go
+++ b/rust/binary_test.go
@@ -23,7 +23,6 @@
 
 // Test that rustlibs default linkage is correct for binaries.
 func TestBinaryLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -87,7 +86,6 @@
 
 // Test that the path returned by HostToolPath is correct
 func TestHostToolPath(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary_host {
 			name: "fizz-buzz",
@@ -102,7 +100,6 @@
 
 // Test that the flags being passed to rust_binary modules are as expected
 func TestBinaryFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary_host {
 			name: "fizz-buzz",
@@ -146,7 +143,6 @@
 }
 
 func TestLinkObjects(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -166,7 +162,6 @@
 
 // Test that stripped versions are correctly generated and used.
 func TestStrippedBinary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "foo",
diff --git a/rust/bindgen_test.go b/rust/bindgen_test.go
index 7ff996d..9cccf13 100644
--- a/rust/bindgen_test.go
+++ b/rust/bindgen_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestRustBindgen(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_bindgen {
 			name: "libbindgen",
@@ -67,7 +66,6 @@
 }
 
 func TestRustBindgenCustomBindgen(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_bindgen {
 			name: "libbindgen",
diff --git a/rust/builder_test.go b/rust/builder_test.go
index cda03a9..5c11cb7 100644
--- a/rust/builder_test.go
+++ b/rust/builder_test.go
@@ -17,7 +17,6 @@
 import "testing"
 
 func TestSourceProviderCollision(t *testing.T) {
-	t.Parallel()
 	testRustError(t, "multiple source providers generate the same filename output: bindings.rs", `
 		rust_binary {
 			name: "source_collider",
diff --git a/rust/clippy_test.go b/rust/clippy_test.go
index 786dc15..7815aab 100644
--- a/rust/clippy_test.go
+++ b/rust/clippy_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestClippy(t *testing.T) {
-	t.Parallel()
 
 	bp := `
 		// foo uses the default value of clippy_lints
diff --git a/rust/compiler_test.go b/rust/compiler_test.go
index 70f0dff..a25523c 100644
--- a/rust/compiler_test.go
+++ b/rust/compiler_test.go
@@ -23,7 +23,6 @@
 
 // Test that feature flags are being correctly generated.
 func TestFeaturesToFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_dylib {
 			name: "libfoo",
@@ -45,7 +44,6 @@
 
 // Test that we reject multiple source files.
 func TestEnforceSingleSourceFile(t *testing.T) {
-	t.Parallel()
 
 	singleSrcError := "srcs can only contain one path for a rust file and source providers prefixed by \":\""
 
@@ -80,7 +78,6 @@
 }
 
 func TestInstallDir(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_dylib {
 			name: "libfoo",
@@ -111,7 +108,6 @@
 }
 
 func TestLints(t *testing.T) {
-	t.Parallel()
 
 	bp := `
 		// foo uses the default value of lints
@@ -184,7 +180,6 @@
 
 // Test that devices are linking the stdlib dynamically
 func TestStdDeviceLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz",
diff --git a/rust/coverage_test.go b/rust/coverage_test.go
index ced548d..90155ca 100644
--- a/rust/coverage_test.go
+++ b/rust/coverage_test.go
@@ -23,7 +23,6 @@
 
 // Test that coverage flags are being correctly generated.
 func TestCoverageFlags(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_library {
 			name: "libfoo_cov",
@@ -99,7 +98,6 @@
 
 // Test coverage files are included correctly
 func TestCoverageZip(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_library {
 			name: "libfoo",
@@ -176,7 +174,6 @@
 }
 
 func TestCoverageDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRustCov(t, `
 		rust_binary {
 			name: "fizz",
diff --git a/rust/library_test.go b/rust/library_test.go
index fdab78d..fec3992 100644
--- a/rust/library_test.go
+++ b/rust/library_test.go
@@ -23,7 +23,6 @@
 
 // Test that variants are being generated correctly, and that crate-types are correct.
 func TestLibraryVariants(t *testing.T) {
-	t.Parallel()
 
 	ctx := testRust(t, `
 		rust_library_host {
@@ -72,7 +71,6 @@
 
 // Test that dylibs are not statically linking the standard library.
 func TestDylibPreferDynamic(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_dylib {
 			name: "libfoo",
@@ -88,7 +86,6 @@
 }
 
 func TestValidateLibraryStem(t *testing.T) {
-	t.Parallel()
 	testRustError(t, "crate_name must be defined.", `
 			rust_library_host {
 				name: "libfoo",
@@ -126,7 +123,6 @@
 }
 
 func TestSharedLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_shared {
 			name: "libfoo",
@@ -149,7 +145,6 @@
 }
 
 func TestStaticLibraryLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_static {
 			name: "libfoo",
@@ -167,7 +162,6 @@
 
 // Test that variants pull in the right type of rustlib autodep
 func TestAutoDeps(t *testing.T) {
-	t.Parallel()
 
 	ctx := testRust(t, `
                 rust_library_host {
@@ -215,7 +209,6 @@
 
 // Test that stripped versions are correctly generated and used.
 func TestStrippedLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_dylib {
 			name: "libfoo",
@@ -247,7 +240,6 @@
 }
 
 func TestLibstdLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library {
 			name: "libfoo",
diff --git a/rust/protobuf_test.go b/rust/protobuf_test.go
index cfe56a3..bd11a5a 100644
--- a/rust/protobuf_test.go
+++ b/rust/protobuf_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestRustProtobuf(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_protobuf {
 			name: "librust_proto",
diff --git a/rust/rust_test.go b/rust/rust_test.go
index ec78860..9b2f023 100644
--- a/rust/rust_test.go
+++ b/rust/rust_test.go
@@ -177,7 +177,6 @@
 
 // Test that we can extract the link path from a lib path.
 func TestLinkPathFromFilePath(t *testing.T) {
-	t.Parallel()
 	barPath := android.PathForTesting("out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/libbar.so")
 	libName := linkPathFromFilePath(barPath)
 	expectedResult := "out/soong/.intermediates/external/libbar/libbar/linux_glibc_x86_64_shared/"
@@ -189,7 +188,6 @@
 
 // Test to make sure dependencies are being picked up correctly.
 func TestDepsTracking(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_ffi_host_static {
 			name: "libstatic",
@@ -251,7 +249,6 @@
 }
 
 func TestSourceProviderDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz-dep",
@@ -339,7 +336,6 @@
 }
 
 func TestSourceProviderTargetMismatch(t *testing.T) {
-	t.Parallel()
 	// This might error while building the dependency tree or when calling depsToPaths() depending on the lunched
 	// target, which results in two different errors. So don't check the error, just confirm there is one.
 	testRustError(t, ".*", `
@@ -362,7 +358,6 @@
 
 // Test to make sure proc_macros use host variants when building device modules.
 func TestProcMacroDeviceDeps(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_host_rlib {
 			name: "libbar",
@@ -390,7 +385,6 @@
 
 // Test that no_stdlibs suppresses dependencies on rust standard libraries
 func TestNoStdlibs(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_binary {
 			name: "fizz-buzz",
@@ -406,7 +400,6 @@
 
 // Test that libraries provide both 32-bit and 64-bit variants.
 func TestMultilib(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_library_rlib {
 			name: "libfoo",
diff --git a/rust/source_provider_test.go b/rust/source_provider_test.go
index f16d694..6e68ae6 100644
--- a/rust/source_provider_test.go
+++ b/rust/source_provider_test.go
@@ -21,7 +21,6 @@
 var stemRequiredError = "source_stem property is undefined but required for rust_bindgen modules"
 
 func TestSourceProviderRequiredFields(t *testing.T) {
-	t.Parallel()
 	testRustError(t, stemRequiredError, `
 		rust_bindgen {
 			name: "libbindgen",
diff --git a/rust/test_test.go b/rust/test_test.go
index bb4695a..fea2ad0 100644
--- a/rust/test_test.go
+++ b/rust/test_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestRustTest(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_test_host {
 			name: "my_test",
@@ -38,7 +37,6 @@
 }
 
 func TestRustTestLinkage(t *testing.T) {
-	t.Parallel()
 	ctx := testRust(t, `
 		rust_test {
 			name: "my_test",
diff --git a/sdk/bp_test.go b/sdk/bp_test.go
index 4cd54c7..e1edc51 100644
--- a/sdk/bp_test.go
+++ b/sdk/bp_test.go
@@ -180,7 +180,6 @@
 }
 
 func TestTransformRemoveProperty(t *testing.T) {
-	t.Parallel()
 
 	helper := &TestHelper{t}
 
@@ -196,7 +195,6 @@
 }
 
 func TestTransformRemovePropertySet(t *testing.T) {
-	t.Parallel()
 
 	helper := &TestHelper{t}
 
diff --git a/sdk/cc_sdk_test.go b/sdk/cc_sdk_test.go
index e0cba09..c214e75 100644
--- a/sdk/cc_sdk_test.go
+++ b/sdk/cc_sdk_test.go
@@ -40,7 +40,6 @@
 // Contains tests for SDK members provided by the cc package.
 
 func TestSingleDeviceOsAssumption(t *testing.T) {
-	t.Parallel()
 	// Mock a module with DeviceSupported() == true.
 	s := &sdk{}
 	android.InitAndroidArchModule(s, android.DeviceSupported, android.MultilibCommon)
@@ -55,7 +54,6 @@
 }
 
 func TestSdkIsCompileMultilibBoth(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -86,7 +84,6 @@
 }
 
 func TestSdkCompileMultilibOverride(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -178,7 +175,6 @@
 }
 
 func TestBasicSdkWithCc(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -285,7 +281,6 @@
 
 // Make sure the sdk can use host specific cc libraries static/shared and both.
 func TestHostSdkWithCc(t *testing.T) {
-	t.Parallel()
 	testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -309,7 +304,6 @@
 
 // Make sure the sdk can use cc libraries static/shared and both.
 func TestSdkWithCc(t *testing.T) {
-	t.Parallel()
 	testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -340,7 +334,6 @@
 }
 
 func TestSnapshotWithObject(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -412,7 +405,6 @@
 }
 
 func TestSnapshotWithCcDuplicateHeaders(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -454,7 +446,6 @@
 // handling is tested with the sanitize clauses (but note there's a lot of
 // built-in logic in sanitize.go that can affect those flags).
 func TestSnapshotWithCcSharedLibraryCommonProperties(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -568,7 +559,6 @@
 }
 
 func TestSnapshotWithCcBinary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "mymodule_exports",
@@ -633,7 +623,6 @@
 }
 
 func TestMultipleHostOsTypesSnapshotWithCcBinary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "myexports",
@@ -760,7 +749,6 @@
 }
 
 func TestSnapshotWithSingleHostOsType(t *testing.T) {
-	t.Parallel()
 	ctx, config := testSdkContext(`
 		cc_defaults {
 			name: "mydefaults",
@@ -924,7 +912,6 @@
 // Test that we support the necessary flags for the linker binary, which is
 // special in several ways.
 func TestSnapshotWithCcStaticNocrtBinary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "mymodule_exports",
@@ -1027,7 +1014,6 @@
 }
 
 func TestSnapshotWithCcSharedLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -1121,7 +1107,6 @@
 }
 
 func TestSnapshotWithCcSharedLibrarySharedLibs(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -1316,7 +1301,6 @@
 }
 
 func TestHostSnapshotWithCcSharedLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -1434,7 +1418,6 @@
 }
 
 func TestMultipleHostOsTypesSnapshotWithCcSharedLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -1560,7 +1543,6 @@
 }
 
 func TestSnapshotWithCcStaticLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "myexports",
@@ -1645,7 +1627,6 @@
 }
 
 func TestHostSnapshotWithCcStaticLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "myexports",
@@ -1760,7 +1741,6 @@
 }
 
 func TestSnapshotWithCcLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "myexports",
@@ -1858,7 +1838,6 @@
 }
 
 func TestHostSnapshotWithMultiLib64(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		module_exports {
 			name: "myexports",
@@ -1966,7 +1945,6 @@
 }
 
 func TestSnapshotWithCcHeadersLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2015,7 +1993,6 @@
 }
 
 func TestHostSnapshotWithCcHeadersLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2098,7 +2075,6 @@
 }
 
 func TestDeviceAndHostSnapshotWithCcHeadersLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2194,7 +2170,6 @@
 }
 
 func TestSystemSharedLibPropagation(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2432,7 +2407,6 @@
 }
 
 func TestStubsLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2511,7 +2485,6 @@
 }
 
 func TestDeviceAndHostSnapshotWithStubsLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
@@ -2628,7 +2601,6 @@
 }
 
 func TestUniqueHostSoname(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithCc(t, `
 		sdk {
 			name: "mysdk",
diff --git a/sdk/exports_test.go b/sdk/exports_test.go
index 173ccb9..aa1200f 100644
--- a/sdk/exports_test.go
+++ b/sdk/exports_test.go
@@ -20,7 +20,6 @@
 
 // Ensure that module_exports generates a module_exports_snapshot module.
 func TestModuleExportsSnapshot(t *testing.T) {
-	t.Parallel()
 	packageBp := `
 		module_exports {
 			name: "myexports",
diff --git a/sdk/java_sdk_test.go b/sdk/java_sdk_test.go
index f86ab57..d6828c9 100644
--- a/sdk/java_sdk_test.go
+++ b/sdk/java_sdk_test.go
@@ -92,7 +92,6 @@
 // Contains tests for SDK members provided by the java package.
 
 func TestSdkDependsOnSourceEvenWhenPrebuiltPreferred(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -142,7 +141,6 @@
 }
 
 func TestBasicSdkWithJavaLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -222,7 +220,6 @@
 }
 
 func TestSnapshotWithJavaHeaderLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -275,7 +272,6 @@
 }
 
 func TestHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -336,7 +332,6 @@
 }
 
 func TestDeviceAndHostSnapshotWithJavaHeaderLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -403,7 +398,6 @@
 }
 
 func TestSnapshotWithJavaImplLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		module_exports {
 			name: "myexports",
@@ -457,7 +451,6 @@
 }
 
 func TestHostSnapshotWithJavaImplLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		module_exports {
 			name: "myexports",
@@ -518,7 +511,6 @@
 }
 
 func TestSnapshotWithJavaTest(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		module_exports {
 			name: "myexports",
@@ -569,7 +561,6 @@
 }
 
 func TestHostSnapshotWithJavaTest(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		module_exports {
 			name: "myexports",
@@ -642,7 +633,6 @@
 // directly or indirectly from an APEX as droidstubs can never be a part of an
 // apex.
 func TestBasicSdkWithDroidstubs(t *testing.T) {
-	t.Parallel()
 	testSdkWithDroidstubs(t, `
 		sdk {
 				name: "mysdk",
@@ -673,7 +663,6 @@
 }
 
 func TestSnapshotWithDroidstubs(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithDroidstubs(t, `
 		module_exports {
 			name: "myexports",
@@ -719,7 +708,6 @@
 }
 
 func TestHostSnapshotWithDroidstubs(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithDroidstubs(t, `
 		module_exports {
 			name: "myexports",
@@ -774,7 +762,6 @@
 }
 
 func TestSnapshotWithJavaSystemModules(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -869,7 +856,6 @@
 }
 
 func TestHostSnapshotWithJavaSystemModules(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -948,7 +934,6 @@
 }
 
 func TestDeviceAndHostSnapshotWithOsSpecificMembers(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		module_exports {
 			name: "myexports",
@@ -1076,7 +1061,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1181,7 +1165,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_SdkVersion_None(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1246,7 +1229,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_SdkVersion_ForScope(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1314,7 +1296,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_ApiScopes(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1405,7 +1386,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_ModuleLib(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1517,7 +1497,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_SystemServer(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
@@ -1608,7 +1587,6 @@
 }
 
 func TestSnapshotWithJavaSdkLibrary_NamingScheme(t *testing.T) {
-	t.Parallel()
 	result := testSdkWithJava(t, `
 		sdk {
 			name: "mysdk",
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index a6afdc5..2e6c62a 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -35,7 +35,6 @@
 }
 
 func TestDepNotInRequiredSdks(t *testing.T) {
-	t.Parallel()
 	testSdkError(t, `module "myjavalib".*depends on "otherlib".*that isn't part of the required SDKs:.*`, `
 		sdk {
 			name: "mysdk",
@@ -96,7 +95,6 @@
 // Ensure that prebuilt modules have the same effective visibility as the source
 // modules.
 func TestSnapshotVisibility(t *testing.T) {
-	t.Parallel()
 	packageBp := `
 		package {
 			default_visibility: ["//other/foo"],
@@ -304,7 +302,6 @@
 }
 
 func TestSDkInstall(t *testing.T) {
-	t.Parallel()
 	sdk := `
 		sdk {
 			name: "mysdk",
@@ -349,7 +346,6 @@
 var _ propertiesContainer = (*testPropertiesStruct)(nil)
 
 func TestCommonValueOptimization(t *testing.T) {
-	t.Parallel()
 	common := &testPropertiesStruct{name: "common"}
 	structs := []propertiesContainer{
 		&testPropertiesStruct{
@@ -447,7 +443,6 @@
 }
 
 func TestCommonValueOptimization_InvalidArchSpecificVariants(t *testing.T) {
-	t.Parallel()
 	common := &testPropertiesStruct{name: "common"}
 	structs := []propertiesContainer{
 		&testPropertiesStruct{
diff --git a/sh/sh_binary_test.go b/sh/sh_binary_test.go
index e9086be..0aa607b 100644
--- a/sh/sh_binary_test.go
+++ b/sh/sh_binary_test.go
@@ -61,7 +61,6 @@
 }
 
 func TestShTestSubDir(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -82,7 +81,6 @@
 }
 
 func TestShTest(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -113,7 +111,6 @@
 }
 
 func TestShTest_dataModules(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test {
 			name: "foo",
@@ -173,7 +170,6 @@
 }
 
 func TestShTestHost(t *testing.T) {
-	t.Parallel()
 	ctx, _ := testShBinary(t, `
 		sh_test_host {
 			name: "foo",
@@ -194,7 +190,6 @@
 }
 
 func TestShTestHost_dataDeviceModules(t *testing.T) {
-	t.Parallel()
 	ctx, config := testShBinary(t, `
 		sh_test_host {
 			name: "foo",
diff --git a/symbol_inject/elf_test.go b/symbol_inject/elf_test.go
index 316c69a..aceee44 100644
--- a/symbol_inject/elf_test.go
+++ b/symbol_inject/elf_test.go
@@ -20,7 +20,6 @@
 )
 
 func TestElfSymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *mockElfFile
 		symbol       string
diff --git a/symbol_inject/macho_test.go b/symbol_inject/macho_test.go
index d5b962d..50df131 100644
--- a/symbol_inject/macho_test.go
+++ b/symbol_inject/macho_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestMachoSymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *macho.File
 		symbol       string
diff --git a/symbol_inject/pe_test.go b/symbol_inject/pe_test.go
index 16b2009..df7bac3 100644
--- a/symbol_inject/pe_test.go
+++ b/symbol_inject/pe_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestPESymbolTable(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		file         *pe.File
 		symbol       string
diff --git a/symbol_inject/symbol_inject_test.go b/symbol_inject/symbol_inject_test.go
index ab874b9..6607e65 100644
--- a/symbol_inject/symbol_inject_test.go
+++ b/symbol_inject/symbol_inject_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestCopyAndInject(t *testing.T) {
-	t.Parallel()
 	s := "abcdefghijklmnopqrstuvwxyz"
 	testCases := []struct {
 		offset   uint64
diff --git a/sysprop/sysprop_test.go b/sysprop/sysprop_test.go
index 7df0f3d..711129c 100644
--- a/sysprop/sysprop_test.go
+++ b/sysprop/sysprop_test.go
@@ -158,7 +158,6 @@
 }
 
 func TestSyspropLibrary(t *testing.T) {
-	t.Parallel()
 	ctx := test(t, `
 		sysprop_library {
 			name: "sysprop-platform",
diff --git a/ui/build/cleanbuild_test.go b/ui/build/cleanbuild_test.go
index be60362..89f4ad9 100644
--- a/ui/build/cleanbuild_test.go
+++ b/ui/build/cleanbuild_test.go
@@ -27,7 +27,6 @@
 )
 
 func TestCleanOldFiles(t *testing.T) {
-	t.Parallel()
 	dir, err := ioutil.TempDir("", "testcleanoldfiles")
 	if err != nil {
 		t.Fatal(err)
diff --git a/ui/build/config_test.go b/ui/build/config_test.go
index 35c6ed4..7b14c47 100644
--- a/ui/build/config_test.go
+++ b/ui/build/config_test.go
@@ -39,7 +39,6 @@
 }
 
 func TestConfigParseArgsJK(t *testing.T) {
-	t.Parallel()
 	ctx := testContext()
 
 	testCases := []struct {
@@ -112,7 +111,6 @@
 }
 
 func TestConfigParseArgsVars(t *testing.T) {
-	t.Parallel()
 	ctx := testContext()
 
 	testCases := []struct {
@@ -640,7 +638,6 @@
 }
 
 func TestConfigSplitArgs(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		// ********* Setup *********
 		// Test description.
diff --git a/ui/build/environment_test.go b/ui/build/environment_test.go
index d8f83f4..37f500f 100644
--- a/ui/build/environment_test.go
+++ b/ui/build/environment_test.go
@@ -21,7 +21,6 @@
 )
 
 func TestEnvUnset(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{"TEST=1", "TEST2=0"}
 	initial.Unset("TEST")
 	got := initial.Environ()
@@ -31,7 +30,6 @@
 }
 
 func TestEnvUnsetMissing(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{"TEST2=0"}
 	initial.Unset("TEST")
 	got := initial.Environ()
@@ -41,7 +39,6 @@
 }
 
 func TestEnvSet(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{}
 	initial.Set("TEST", "0")
 	got := initial.Environ()
@@ -51,7 +48,6 @@
 }
 
 func TestEnvSetDup(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{"TEST=1"}
 	initial.Set("TEST", "0")
 	got := initial.Environ()
@@ -61,7 +57,6 @@
 }
 
 func TestEnvAllow(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{"TEST=1", "TEST2=0", "TEST3=2"}
 	initial.Allow("TEST3", "TEST")
 	got := initial.Environ()
@@ -78,7 +73,6 @@
 `
 
 func TestEnvAppendFromKati(t *testing.T) {
-	t.Parallel()
 	initial := &Environment{"CLANG=/usr/bin/clang", "TEST=0"}
 	err := initial.appendFromKati(strings.NewReader(testKatiEnvFileContents))
 	if err != nil {
diff --git a/ui/build/paths/logs_test.go b/ui/build/paths/logs_test.go
index d5921a8..3b1005f 100644
--- a/ui/build/paths/logs_test.go
+++ b/ui/build/paths/logs_test.go
@@ -26,7 +26,6 @@
 )
 
 func TestSendLog(t *testing.T) {
-	t.Parallel()
 	t.Run("Short name", func(t *testing.T) {
 		d, err := ioutil.TempDir("", "s")
 		if err != nil {
@@ -106,7 +105,6 @@
 }
 
 func TestSendLogError(t *testing.T) {
-	t.Parallel()
 	d, err := ioutil.TempDir("", "log_socket")
 	if err != nil {
 		t.Fatal(err)
diff --git a/ui/build/proc_sync_test.go b/ui/build/proc_sync_test.go
index 1b52fce..857bea3 100644
--- a/ui/build/proc_sync_test.go
+++ b/ui/build/proc_sync_test.go
@@ -108,7 +108,6 @@
 
 // simple test
 func TestGetLock(t *testing.T) {
-	t.Parallel()
 	lockfile := lockOrFail(t)
 	defer removeTestLock(lockfile)
 }
@@ -120,7 +119,6 @@
 var busyStatus = 2
 
 func TestTrylock(t *testing.T) {
-	t.Parallel()
 	lockpath := os.Getenv(lockPathVariable)
 	if len(lockpath) < 1 {
 		checkTrylockMainProcess(t)
@@ -206,7 +204,6 @@
 }
 
 func TestLockFirstTrySucceeds(t *testing.T) {
-	t.Parallel()
 	noopLogger := logger.New(ioutil.Discard)
 	lock := testLockCountingTo(0)
 	waiter := newCountWaiter(0)
@@ -219,7 +216,6 @@
 	}
 }
 func TestLockThirdTrySucceeds(t *testing.T) {
-	t.Parallel()
 	noopLogger := logger.New(ioutil.Discard)
 	lock := testLockCountingTo(2)
 	waiter := newCountWaiter(2)
@@ -232,7 +228,6 @@
 	}
 }
 func TestLockTimedOut(t *testing.T) {
-	t.Parallel()
 	noopLogger := logger.New(ioutil.Discard)
 	lock := testLockCountingTo(3)
 	waiter := newCountWaiter(2)
diff --git a/ui/build/rbe_test.go b/ui/build/rbe_test.go
index fa371bb..8ff96bc 100644
--- a/ui/build/rbe_test.go
+++ b/ui/build/rbe_test.go
@@ -26,7 +26,6 @@
 )
 
 func TestDumpRBEMetrics(t *testing.T) {
-	t.Parallel()
 	ctx := testContext()
 	tests := []struct {
 		description string
@@ -82,7 +81,6 @@
 }
 
 func TestDumpRBEMetricsErrors(t *testing.T) {
-	t.Parallel()
 	ctx := testContext()
 	tests := []struct {
 		description      string
diff --git a/ui/build/util_test.go b/ui/build/util_test.go
index a06c3e9..b22e997 100644
--- a/ui/build/util_test.go
+++ b/ui/build/util_test.go
@@ -25,7 +25,6 @@
 )
 
 func TestEnsureEmptyDirs(t *testing.T) {
-	t.Parallel()
 	ctx := testContext()
 	defer logger.Recover(func(err error) {
 		t.Error(err)
@@ -53,7 +52,6 @@
 }
 
 func TestCopyFile(t *testing.T) {
-	t.Parallel()
 	tmpDir, err := ioutil.TempDir("", "test_copy_file")
 	if err != nil {
 		t.Fatalf("failed to create temporary directory to hold test text files: %v", err)
@@ -88,7 +86,6 @@
 }
 
 func TestCopyFileErrors(t *testing.T) {
-	t.Parallel()
 	tmpDir, err := ioutil.TempDir("", "test_copy_file_errors")
 	if err != nil {
 		t.Fatalf("failed to create temporary directory to hold test text files: %v", err)
diff --git a/ui/logger/logger_test.go b/ui/logger/logger_test.go
index 7b3791c..044e6f0 100644
--- a/ui/logger/logger_test.go
+++ b/ui/logger/logger_test.go
@@ -29,7 +29,6 @@
 )
 
 func TestCreateFileWithRotation(t *testing.T) {
-	t.Parallel()
 	dir, err := ioutil.TempDir("", "test-rotation")
 	if err != nil {
 		t.Fatalf("Failed to get TempDir: %v", err)
@@ -97,7 +96,6 @@
 }
 
 func TestPanic(t *testing.T) {
-	t.Parallel()
 	if os.Getenv("ACTUALLY_PANIC") == "1" {
 		panicValue := "foo"
 		log := New(&bytes.Buffer{})
@@ -130,7 +128,6 @@
 }
 
 func TestFatal(t *testing.T) {
-	t.Parallel()
 	if os.Getenv("ACTUALLY_FATAL") == "1" {
 		log := New(&bytes.Buffer{})
 		defer func() {
@@ -153,7 +150,6 @@
 }
 
 func TestNonFatal(t *testing.T) {
-	t.Parallel()
 	if os.Getenv("ACTUAL_TEST") == "1" {
 		log := New(&bytes.Buffer{})
 		defer log.Cleanup()
@@ -170,7 +166,6 @@
 }
 
 func TestRecoverFatal(t *testing.T) {
-	t.Parallel()
 	log := New(&bytes.Buffer{})
 	defer func() {
 		if p := recover(); p != nil {
@@ -187,7 +182,6 @@
 }
 
 func TestRecoverNonFatal(t *testing.T) {
-	t.Parallel()
 	log := New(&bytes.Buffer{})
 	defer func() {
 		if p := recover(); p == nil {
@@ -204,7 +198,6 @@
 }
 
 func TestRuntimePanic(t *testing.T) {
-	t.Parallel()
 	defer func() {
 		if p := recover(); p == nil {
 			t.Errorf("Panic not thrown")
diff --git a/ui/metrics/time_test.go b/ui/metrics/time_test.go
index 16d6a20..d73080a 100644
--- a/ui/metrics/time_test.go
+++ b/ui/metrics/time_test.go
@@ -22,7 +22,6 @@
 )
 
 func TestEnd(t *testing.T) {
-	t.Parallel()
 	startTime := time.Date(2020, time.July, 13, 13, 0, 0, 0, time.UTC)
 	dur := time.Nanosecond * 10
 	initialNow := _now
diff --git a/ui/status/critical_path_test.go b/ui/status/critical_path_test.go
index e44298b..965e0ad 100644
--- a/ui/status/critical_path_test.go
+++ b/ui/status/critical_path_test.go
@@ -51,7 +51,6 @@
 }
 
 func TestCriticalPath(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name     string
 		msgs     func(*testCriticalPath)
diff --git a/ui/status/kati_test.go b/ui/status/kati_test.go
index 24a38b3..f2cb813 100644
--- a/ui/status/kati_test.go
+++ b/ui/status/kati_test.go
@@ -43,7 +43,6 @@
 func (l *lastOutput) Flush() {}
 
 func TestKatiNormalCase(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	output := &lastOutput{}
 	status.AddOutput(output)
@@ -111,7 +110,6 @@
 }
 
 func TestKatiExtraIncludes(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	output := &lastOutput{}
 	status.AddOutput(output)
@@ -158,7 +156,6 @@
 }
 
 func TestKatiFailOnError(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	output := &lastOutput{}
 	status.AddOutput(output)
diff --git a/ui/status/ninja_test.go b/ui/status/ninja_test.go
index 232be55..c400c97 100644
--- a/ui/status/ninja_test.go
+++ b/ui/status/ninja_test.go
@@ -26,7 +26,6 @@
 
 // Tests that closing the ninja reader when nothing has opened the other end of the fifo is fast.
 func TestNinjaReader_Close(t *testing.T) {
-	t.Parallel()
 	tempDir, err := ioutil.TempDir("", "ninja_test")
 	if err != nil {
 		t.Fatal(err)
diff --git a/ui/status/status_test.go b/ui/status/status_test.go
index 2a90c7b..9494582 100644
--- a/ui/status/status_test.go
+++ b/ui/status/status_test.go
@@ -53,7 +53,6 @@
 }
 
 func TestBasicUse(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	counts := &counterOutput{}
 	status.AddOutput(counts)
@@ -102,7 +101,6 @@
 
 // For when a tool claims to have 2 actions, but finishes after one.
 func TestFinishEarly(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	counts := &counterOutput{}
 	status.AddOutput(counts)
@@ -131,7 +129,6 @@
 
 // For when a tool claims to have 1 action, but starts two.
 func TestExtraActions(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	counts := &counterOutput{}
 	status.AddOutput(counts)
@@ -152,7 +149,6 @@
 
 // When a tool calls Finish() with a running Action
 func TestRunningWhenFinished(t *testing.T) {
-	t.Parallel()
 	status := &Status{}
 	counts := &counterOutput{}
 	status.AddOutput(counts)
diff --git a/ui/terminal/status_test.go b/ui/terminal/status_test.go
index da10912..aa69dff 100644
--- a/ui/terminal/status_test.go
+++ b/ui/terminal/status_test.go
@@ -25,7 +25,6 @@
 )
 
 func TestStatusOutput(t *testing.T) {
-	t.Parallel()
 	tests := []struct {
 		name   string
 		calls  func(stat status.StatusOutput)
@@ -267,7 +266,6 @@
 }
 
 func TestSmartStatusOutputWidthChange(t *testing.T) {
-	t.Parallel()
 	os.Setenv(tableHeightEnVar, "")
 
 	smart := &fakeSmartTerminal{termWidth: 40}
diff --git a/ui/terminal/util_test.go b/ui/terminal/util_test.go
index b01b133..82bde7c 100644
--- a/ui/terminal/util_test.go
+++ b/ui/terminal/util_test.go
@@ -19,7 +19,6 @@
 )
 
 func TestStripAnsiEscapes(t *testing.T) {
-	t.Parallel()
 	testcases := []struct {
 		input  string
 		output string
diff --git a/xml/xml_test.go b/xml/xml_test.go
index d9a6cee..abcb108 100644
--- a/xml/xml_test.go
+++ b/xml/xml_test.go
@@ -78,7 +78,6 @@
 
 // Minimal test
 func TestPrebuiltEtcXml(t *testing.T) {
-	t.Parallel()
 	ctx := testXml(t, `
 		prebuilt_etc_xml {
 			name: "foo.xml",
diff --git a/zip/zip_test.go b/zip/zip_test.go
index 9e1ef90..302a749 100644
--- a/zip/zip_test.go
+++ b/zip/zip_test.go
@@ -102,7 +102,6 @@
 }
 
 func TestZip(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name               string
 		args               *FileArgsBuilder
@@ -531,7 +530,6 @@
 }
 
 func TestReadRespFile(t *testing.T) {
-	t.Parallel()
 	testCases := []struct {
 		name, in string
 		out      []string
@@ -604,7 +602,6 @@
 }
 
 func TestSrcJar(t *testing.T) {
-	t.Parallel()
 	mockFs := pathtools.MockFs(map[string][]byte{
 		"wrong_package.java":       []byte("package foo;"),
 		"foo/correct_package.java": []byte("package foo;"),