diff --git a/reposerver/repository/repository_norace_test.go b/reposerver/repository/repository_norace_test.go
deleted file mode 100644
index 96c09039b3fe..000000000000
--- a/reposerver/repository/repository_norace_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-//go:build !race
-// +build !race
-
-package repository
-
-import (
-	"os"
-	"path/filepath"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	argoappv1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
-	"github.com/argoproj/argo-cd/v2/reposerver/apiclient"
-)
-
-func TestHelmDependencyWithConcurrency(t *testing.T) {
-
-	// !race:
-	// Un-synchronized use of a random source, will be fixed when this is merged:
-	// https://github.com/argoproj/argo-cd/issues/4728
-
-	cleanup := func() {
-		_ = os.Remove(filepath.Join("../../util/helm/testdata/dependency", helmDepUpMarkerFile))
-		_ = os.RemoveAll(filepath.Join("../../util/helm/testdata/dependency", "charts"))
-	}
-	cleanup()
-	defer cleanup()
-
-	helmRepo := argoappv1.Repository{Name: "bitnami", Type: "helm", Repo: "https://charts.bitnami.com/bitnami"}
-	var wg sync.WaitGroup
-	wg.Add(3)
-	for i := 0; i < 3; i++ {
-		go func() {
-			res, err := helmTemplate("../../util/helm/testdata/dependency", "../..", nil, &apiclient.ManifestRequest{
-				ApplicationSource: &argoappv1.ApplicationSource{},
-				Repos:             []*argoappv1.Repository{&helmRepo},
-			}, false)
-
-			assert.NoError(t, err)
-			assert.NotNil(t, res)
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
diff --git a/reposerver/repository/repository_test.go b/reposerver/repository/repository_test.go
index 47f2c629b483..6c43fc93df15 100644
--- a/reposerver/repository/repository_test.go
+++ b/reposerver/repository/repository_test.go
@@ -354,28 +354,6 @@ func TestGenerateJsonnetLibOutside(t *testing.T) {
 	require.Contains(t, err.Error(), "value file '../../../testdata/jsonnet/vendor' resolved to outside repository root")
 }
 
-func TestGenerateHelmChartWithDependencies(t *testing.T) {
-	service := newService("../..")
-
-	cleanup := func() {
-		_ = os.Remove(filepath.Join("../../util/helm/testdata/dependency", helmDepUpMarkerFile))
-		_ = os.RemoveAll(filepath.Join("../../util/helm/testdata/dependency", "charts"))
-	}
-	cleanup()
-	defer cleanup()
-
-	helmRepo := argoappv1.Repository{Name: "bitnami", Type: "helm", Repo: "https://charts.bitnami.com/bitnami"}
-	q := apiclient.ManifestRequest{
-		Repo: &argoappv1.Repository{},
-		ApplicationSource: &argoappv1.ApplicationSource{
-			Path: "./util/helm/testdata/dependency",
-		},
-		Repos: []*argoappv1.Repository{&helmRepo},
-	}
-	res1, err := service.GenerateManifest(context.Background(), &q)
-	assert.Nil(t, err)
-	assert.Len(t, res1.Manifests, 10)
-}
 func TestManifestGenErrorCacheByNumRequests(t *testing.T) {
 
 	// Returns the state of the manifest generation cache, by querying the cache for the previously set result
diff --git a/util/helm/helm_test.go b/util/helm/helm_test.go
index d140345559e1..67199c19020e 100644
--- a/util/helm/helm_test.go
+++ b/util/helm/helm_test.go
@@ -1,8 +1,6 @@
 package helm
 
 import (
-	"fmt"
-	"os"
 	"testing"
 
 	"github.com/argoproj/argo-cd/v2/util/io/path"
@@ -103,27 +101,6 @@ func TestHelmGetParamsValueFilesThatExist(t *testing.T) {
 	assert.Equal(t, slaveCountParam, "3")
 }
 
-func TestHelmDependencyBuild(t *testing.T) {
-	helmRepos := []HelmRepository{{Name: "bitnami", Repo: "https://charts.bitnami.com/bitnami"}}
-	chart := "dependency"
-	clean := func() {
-		_ = os.RemoveAll("./testdata/dependency/charts")
-		_ = os.RemoveAll("./testdata/dependency/Chart.lock")
-	}
-	clean()
-	defer clean()
-	h, err := NewHelmApp(fmt.Sprintf("./testdata/%s", chart), helmRepos, false, "", "", false)
-	assert.NoError(t, err)
-	err = h.Init()
-	assert.NoError(t, err)
-	_, err = h.Template(&TemplateOpts{Name: "wordpress"})
-	assert.Error(t, err)
-	err = h.DependencyBuild()
-	assert.NoError(t, err)
-	_, err = h.Template(&TemplateOpts{Name: "wordpress"})
-	assert.NoError(t, err)
-}
-
 func TestHelmTemplateReleaseNameOverwrite(t *testing.T) {
 	h, err := NewHelmApp("./testdata/redis", nil, false, "", "", false)
 	assert.NoError(t, err)