diff --git a/integrationtests/self/self_test.go b/integrationtests/self/self_test.go
index e1ea1127..7516cafc 100644
--- a/integrationtests/self/self_test.go
+++ b/integrationtests/self/self_test.go
@@ -161,12 +161,6 @@ func newUDPConnLocalhost(t testing.TB) *net.UDPConn {
 	return conn
 }
 
-func areHandshakesRunning() bool {
-	var b bytes.Buffer
-	pprof.Lookup("goroutine").WriteTo(&b, 1)
-	return strings.Contains(b.String(), "RunHandshake")
-}
-
 func areTransportsRunning() bool {
 	var b bytes.Buffer
 	pprof.Lookup("goroutine").WriteTo(&b, 1)
@@ -194,10 +188,6 @@ func TestMain(m *testing.M) {
 	if status != 0 {
 		os.Exit(status)
 	}
-	if areHandshakesRunning() {
-		fmt.Println("stray handshake goroutines found")
-		os.Exit(1)
-	}
 	if areTransportsRunning() {
 		fmt.Println("stray transport goroutines found")
 		os.Exit(1)
diff --git a/integrationtests/self/timeout_test.go b/integrationtests/self/timeout_test.go
index a4fabb6f..a09beb0f 100644
--- a/integrationtests/self/timeout_test.go
+++ b/integrationtests/self/timeout_test.go
@@ -498,8 +498,6 @@ func testFaultyPacketConn(t *testing.T, pers protocol.Perspective) {
 		require.True(t, nerr.Timeout())
 	}
 
-	require.Eventually(t, func() bool { return !areHandshakesRunning() }, 5*handshakeTimeout, 5*time.Millisecond)
-
 	select {
 	case serverErr := <-serverErrChan: // The handshake completed on the server side.
 		require.Error(t, serverErr)