diff --git a/src/test/java/org/mobilitydb/spark/GeneratedSqlSurfaceTest.java b/src/test/java/org/mobilitydb/spark/GeneratedSqlSurfaceTest.java
index ca1ff2cb..6668daf0 100644
--- a/src/test/java/org/mobilitydb/spark/GeneratedSqlSurfaceTest.java
+++ b/src/test/java/org/mobilitydb/spark/GeneratedSqlSurfaceTest.java
@@ -57,9 +57,6 @@ class GeneratedSqlSurfaceTest {
 
     @BeforeAll
     static void init() {
-        // No-op error handler so a parse error returns rather than terminating the JVM.
-        GeneratedFunctions.meos_initialize_error_handler((level, code, message) -> { });
-        GeneratedFunctions.meos_initialize();
         tfloat = "tfloatFromHexWKB('" + TFloat.encode(GeneratedFunctions.tfloat_in(
                 "[1@2020-01-01 00:00:00+00, 3@2020-01-03 00:00:00+00]")) + "')";
         tint = "tintFromHexWKB('" + TInt.encode(GeneratedFunctions.tint_in(
@@ -74,11 +71,10 @@ static void init() {
     }
 
     @AfterAll
-    static void finalizeMeos() {
+    static void stopSpark() {
         if (spark != null) {
             spark.stop();
         }
-        GeneratedFunctions.meos_finalize();
     }
 
     private static Object scalar(String sql) {
diff --git a/src/test/java/org/mobilitydb/spark/SqlSurfaceOverUdfSurfaceTest.java b/src/test/java/org/mobilitydb/spark/SqlSurfaceOverUdfSurfaceTest.java
index 238d2b64..e4de55b2 100644
--- a/src/test/java/org/mobilitydb/spark/SqlSurfaceOverUdfSurfaceTest.java
+++ b/src/test/java/org/mobilitydb/spark/SqlSurfaceOverUdfSurfaceTest.java
@@ -49,9 +49,6 @@ class SqlSurfaceOverUdfSurfaceTest {
 
     @BeforeAll
     static void init() {
-        // No-op error handler so a parse error returns rather than terminating the JVM.
-        GeneratedFunctions.meos_initialize_error_handler((level, code, message) -> { });
-        GeneratedFunctions.meos_initialize();
         trip = "tgeompointFromHexEWKB('" + TGeomPoint.encode(GeneratedFunctions.tgeompoint_in(
                 "[Point(1 1)@2020-01-01 00:00:00+00, Point(2 2)@2020-01-02 00:00:00+00]")) + "')";
         spark = SparkSession.builder().appName("sql-over-udf-surface").master("local[1]")
@@ -64,11 +61,10 @@ static void init() {
     }
 
     @AfterAll
-    static void finalizeMeos() {
+    static void stopSpark() {
         if (spark != null) {
             spark.stop();
         }
-        GeneratedFunctions.meos_finalize();
     }
 
     private static Object scalar(String sql) {