diff --git a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
index fc5753dcefc4..57bf0d51b446 100644
--- a/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
+++ b/pkg/ccl/logictestccl/tests/3node-tenant/generated_test.go
@@ -667,6 +667,13 @@ func TestTenantLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestTenantLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestTenantLogic_drop_index(
 	t *testing.T,
 ) {
@@ -702,13 +709,6 @@ func TestTenantLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestTenantLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestTenantLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/testdata/logic_test/drop_routine b/pkg/sql/logictest/testdata/logic_test/drop_function
similarity index 100%
rename from pkg/sql/logictest/testdata/logic_test/drop_routine
rename to pkg/sql/logictest/testdata/logic_test/drop_function
diff --git a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go
index 0cbcb77c75f2..1341f0183d65 100644
--- a/pkg/sql/logictest/tests/fakedist-disk/generated_test.go
+++ b/pkg/sql/logictest/tests/fakedist-disk/generated_test.go
@@ -638,6 +638,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -673,13 +680,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go
index ee5efc06faa7..de43441d1546 100644
--- a/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go
+++ b/pkg/sql/logictest/tests/fakedist-vec-off/generated_test.go
@@ -638,6 +638,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -673,13 +680,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/fakedist/generated_test.go b/pkg/sql/logictest/tests/fakedist/generated_test.go
index 52869f62da3c..3739f932b7c6 100644
--- a/pkg/sql/logictest/tests/fakedist/generated_test.go
+++ b/pkg/sql/logictest/tests/fakedist/generated_test.go
@@ -638,6 +638,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -673,13 +680,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go
index 2df522504b1f..8bed2679470e 100644
--- a/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go
+++ b/pkg/sql/logictest/tests/local-legacy-schema-changer/generated_test.go
@@ -631,6 +631,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -659,13 +666,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/local-mixed-22.2-23.1/generated_test.go b/pkg/sql/logictest/tests/local-mixed-22.2-23.1/generated_test.go
index c4ecfdcfe700..c8a5dcf729f3 100644
--- a/pkg/sql/logictest/tests/local-mixed-22.2-23.1/generated_test.go
+++ b/pkg/sql/logictest/tests/local-mixed-22.2-23.1/generated_test.go
@@ -631,6 +631,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -666,13 +673,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/local-vec-off/generated_test.go b/pkg/sql/logictest/tests/local-vec-off/generated_test.go
index 207033e4b8e9..f90e78395e90 100644
--- a/pkg/sql/logictest/tests/local-vec-off/generated_test.go
+++ b/pkg/sql/logictest/tests/local-vec-off/generated_test.go
@@ -638,6 +638,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -673,13 +680,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {
diff --git a/pkg/sql/logictest/tests/local/generated_test.go b/pkg/sql/logictest/tests/local/generated_test.go
index 9f54f73e5f2c..8004f258062e 100644
--- a/pkg/sql/logictest/tests/local/generated_test.go
+++ b/pkg/sql/logictest/tests/local/generated_test.go
@@ -659,6 +659,13 @@ func TestLogic_drop_database(
 	runLogicTest(t, "drop_database")
 }
 
+func TestLogic_drop_function(
+	t *testing.T,
+) {
+	defer leaktest.AfterTest(t)()
+	runLogicTest(t, "drop_function")
+}
+
 func TestLogic_drop_index(
 	t *testing.T,
 ) {
@@ -694,13 +701,6 @@ func TestLogic_drop_role_with_default_privileges_in_schema(
 	runLogicTest(t, "drop_role_with_default_privileges_in_schema")
 }
 
-func TestLogic_drop_routine(
-	t *testing.T,
-) {
-	defer leaktest.AfterTest(t)()
-	runLogicTest(t, "drop_routine")
-}
-
 func TestLogic_drop_schema(
 	t *testing.T,
 ) {