diff --git a/test/e2e/scenario_runtime-cloudevents_test.go b/test/e2e/scenario_runtime-cloudevents_test.go
index 0f7eaa8780..4c96d7a716 100644
--- a/test/e2e/scenario_runtime-cloudevents_test.go
+++ b/test/e2e/scenario_runtime-cloudevents_test.go
@@ -7,7 +7,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"gotest.tools/v3/assert"
 	"knative.dev/func/test/testhttp"
@@ -36,15 +35,7 @@ func lifecycleCloudEventsTest(t *testing.T, language string, builder string) {
 
 	knFunc.Exec("create", "--language", language, "--template", "cloudevents", funcPath)
 	knFunc.Exec("deploy", "--registry", common.GetRegistry(), "--builder", builder, "--path", funcPath)
-
-	defer func() {
-		// temporarily ignore deletion error because Node has broken signal handling
-		// TODO fix this
-		if builder == "s2i" && (language == "node" || language == "typescript") && time.Now().Before(time.Date(2024, 5, 31, 0, 0, 0, 0, time.UTC)) {
-			knFunc.ShouldFailOnError = false
-		}
-		knFunc.Exec("delete", "--path", funcPath)
-	}()
+	defer knFunc.Exec("delete", "--path", funcPath)
 
 	_, functionUrl := common.WaitForFunctionReady(t, funcName)
 
diff --git a/test/e2e/scenario_runtime-http_test.go b/test/e2e/scenario_runtime-http_test.go
index 9a5006cf34..554d81ba49 100644
--- a/test/e2e/scenario_runtime-http_test.go
+++ b/test/e2e/scenario_runtime-http_test.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"gotest.tools/v3/assert"
 	"knative.dev/func/test/testhttp"
@@ -76,15 +75,7 @@ func lifecycleHttpTest(t *testing.T, language string, builder string) {
 
 	knFunc.Exec("create", "--language", language, "--template", "http", funcPath)
 	knFunc.Exec("deploy", "--registry", common.GetRegistry(), "--builder", builder, "--path", funcPath)
-
-	defer func() {
-		// temporarily ignore deletion error because Node has broken signal handling
-		// TODO fix this
-		if builder == "s2i" && (language == "node" || language == "typescript") && time.Now().Before(time.Date(2024, 5, 31, 0, 0, 0, 0, time.UTC)) {
-			knFunc.ShouldFailOnError = false
-		}
-		knFunc.Exec("delete", "--path", funcPath)
-	}()
+	defer knFunc.Exec("delete", "--path", funcPath)
 
 	_, functionUrl := common.WaitForFunctionReady(t, funcName)
 
diff --git a/test/oncluster/scenario_runtime_test.go b/test/oncluster/scenario_runtime_test.go
index 53dc69b44e..c783f9d7a6 100644
--- a/test/oncluster/scenario_runtime_test.go
+++ b/test/oncluster/scenario_runtime_test.go
@@ -8,7 +8,6 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
-	"time"
 
 	"k8s.io/apimachinery/pkg/util/rand"
 	common "knative.dev/func/test/common"
@@ -82,14 +81,7 @@ func runtimeImpl(t *testing.T, lang string, builder string) {
 		"--builder", builder,
 		"--git-url", remoteRepo.ClusterCloneURL)
 
-	defer func() {
-		// temporarily ignore deletion error because Node has broken signal handling
-		// TODO fix this
-		if builder == "s2i" && (lang == "node" || lang == "typescript") && time.Now().Before(time.Date(2024, 5, 31, 0, 0, 0, 0, time.UTC)) {
-			knFunc.ShouldFailOnError = false
-		}
-		knFunc.Exec("delete", "-p", funcPath)
-	}()
+	defer knFunc.Exec("delete", "-p", funcPath)
 
 	// -- Assertions --
 	result := knFunc.Exec("invoke", "-p", funcPath)