diff --git a/Mergin/test/test_help.py b/Mergin/test/test_help.py
index 8d45bbff..d628405f 100644
--- a/Mergin/test/test_help.py
+++ b/Mergin/test/test_help.py
@@ -12,6 +12,7 @@
 class test_help(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         start_app()
 
     def test_help_urls(self):
diff --git a/Mergin/test/test_packaging.py b/Mergin/test/test_packaging.py
index 9673fd30..025eb8d2 100644
--- a/Mergin/test/test_packaging.py
+++ b/Mergin/test/test_packaging.py
@@ -14,6 +14,7 @@
 class test_packaging(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         start_app()
 
     def test_copy_raster(self):
diff --git a/Mergin/test/test_utils.py b/Mergin/test/test_utils.py
index b00b388d..898987eb 100644
--- a/Mergin/test/test_utils.py
+++ b/Mergin/test/test_utils.py
@@ -21,6 +21,7 @@
 class test_utils(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         start_app()
 
     def tearDown(self):
diff --git a/Mergin/test/test_validations.py b/Mergin/test/test_validations.py
index 47928cd5..25f2ffe5 100644
--- a/Mergin/test/test_validations.py
+++ b/Mergin/test/test_validations.py
@@ -15,6 +15,7 @@
 class test_validations(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
+        super().setUpClass()
         start_app()
 
     def tearDown(self):
diff --git a/Mergin/utils.py b/Mergin/utils.py
index c5fa5c9e..e570eaea 100644
--- a/Mergin/utils.py
+++ b/Mergin/utils.py
@@ -775,7 +775,11 @@ def update_datasource(layer, new_path):
     """Updates layer datasource, so the layer is loaded from the new location"""
     options = QgsDataProvider.ProviderOptions()
     options.layerName = layer.name()
-    if layer.dataProvider().name() == "vectortile":
+    if layer.dataProvider().name() == "mbtilesvectortiles":
+        # For 3.31 and master
+        layer.setDataSource(f"url={new_path}&type=mbtiles", layer.name(), layer.dataProvider().name(), options)
+    elif layer.dataProvider().name() == "vectortile":
+        # For 3.22
         layer.setDataSource(f"url={new_path}&type=mbtiles", layer.name(), layer.dataProvider().name(), options)
     elif layer.dataProvider().name() == "wms":
         layer.setDataSource(f"url=file://{new_path}&type=mbtiles", layer.name(), layer.dataProvider().name(), options)