diff --git a/internal/gitaly/service/smarthttp/upload_pack_test.go b/internal/gitaly/service/smarthttp/upload_pack_test.go
index 032caacfaf700aeb3b002dfc38d0a7e4b1af698c..467a37872352c4c84f02f6a3aba254f1349a25d2 100644
--- a/internal/gitaly/service/smarthttp/upload_pack_test.go
+++ b/internal/gitaly/service/smarthttp/upload_pack_test.go
@@ -106,12 +106,6 @@ func TestServer_PostUploadPackSidechannel_gitConfigOptions(t *testing.T) {
 }
 
 func testServerPostUploadPackGitConfigOptions(t *testing.T, ctx context.Context, makeRequest requestMaker, opts ...testcfg.Option) {
-	testhelper.SkipQuarantinedTest(
-		t,
-		"https://gitlab.com/gitlab-org/gitaly/-/issues/5027",
-		"TestServer_PostUploadPackSidechannel_gitConfigOptions/no_config_options",
-	)
-
 	cfg := testcfg.Build(t, opts...)
 	testcfg.BuildGitalyHooks(t, cfg)
 
@@ -505,9 +499,11 @@ func makePostUploadPackWithSidechannelRequest(t *testing.T, ctx context.Context,
 		var wg sync.WaitGroup
 		defer wg.Wait()
 
+		clientDone := make(chan struct{})
 		wg.Add(1)
 		errC := make(chan error, 1)
 		go func() {
+			<-clientDone
 			defer wg.Done()
 			_, err := io.Copy(responseBuffer, sideConn)
 			errC <- err
@@ -522,6 +518,7 @@ func makePostUploadPackWithSidechannelRequest(t *testing.T, ctx context.Context,
 		if err := sideConn.CloseWrite(); err != nil {
 			return err
 		}
+		close(clientDone)
 
 		return <-errC
 	})