diff --git a/pkg/proc/core/core_test.go b/pkg/proc/core/core_test.go
index 5a0dca5c09..5373163ac4 100644
--- a/pkg/proc/core/core_test.go
+++ b/pkg/proc/core/core_test.go
@@ -202,6 +202,9 @@ func TestCore(t *testing.T) {
 	if runtime.GOOS != "linux" || runtime.GOARCH != "amd64" {
 		return
 	}
+	if runtime.GOOS == "linux" && os.Getenv("CI") == "true" && buildMode == "pie" {
+		t.Skip("disabled on linux, Github Actions, with PIE buildmode")
+	}
 	p := withCoreFile(t, "panic", "")
 
 	gs, _, err := proc.GoroutinesInfo(p, 0, 0)
@@ -349,6 +352,9 @@ func TestCoreWithEmptyString(t *testing.T) {
 	if runtime.GOOS != "linux" || runtime.GOARCH != "amd64" {
 		return
 	}
+	if runtime.GOOS == "linux" && os.Getenv("CI") == "true" && buildMode == "pie" {
+		t.Skip("disabled on linux, Github Actions, with PIE buildmode")
+	}
 	p := withCoreFile(t, "coreemptystring", "")
 
 	gs, _, err := proc.GoroutinesInfo(p, 0, 0)
diff --git a/pkg/proc/proc_test.go b/pkg/proc/proc_test.go
index 92e6e38db5..8a41016568 100644
--- a/pkg/proc/proc_test.go
+++ b/pkg/proc/proc_test.go
@@ -2816,6 +2816,9 @@ func TestAttachDetach(t *testing.T) {
 	if testBackend == "rr" {
 		return
 	}
+	if os.Getenv("CI") == "true" {
+		t.Skip("disabled on Github actions")
+	}
 	var buildFlags protest.BuildFlags
 	if buildMode == "pie" {
 		buildFlags |= protest.BuildModePIE
diff --git a/service/dap/server_test.go b/service/dap/server_test.go
index cbf857714b..e8d6ad96ba 100644
--- a/service/dap/server_test.go
+++ b/service/dap/server_test.go
@@ -1462,17 +1462,12 @@ func TestEvaluateCallRequest(t *testing.T) {
 					// and not the return to the original point of injection after it
 					// completed.
 					client.EvaluateRequest("call makeclos(nil)", 1000, "not watch")
-					client.ExpectStoppedEvent(t)
+					stopped := client.ExpectStoppedEvent(t)
 					erres = client.ExpectVisibleErrorResponse(t)
 					if erres.Body.Error.Format != "Unable to evaluate expression: call stopped" {
 						t.Errorf("\ngot %#v\nwant Format=\"Unable to evaluate expression: call stopped\"", erres)
 					}
-					if (goversion.VersionAfterOrEqual(runtime.Version(), 1, 15) && (runtime.GOOS == "linux" || runtime.GOOS == "windows")) ||
-						runtime.GOOS == "freebsd" {
-						handleStop(t, client, 1, "runtime.debugCallWrap", -1)
-					} else {
-						handleStop(t, client, 1, "main.makeclos", 88)
-					}
+					handleStop(t, client, stopped.Body.ThreadId, "main.makeclos", 88)
 
 					// Complete the call and get back to original breakpoint in makeclos()
 					client.ContinueRequest(1)