diff --git a/tests/test_cyclic_nearest.py b/tests/test_cyclic_nearest.py
index fbf7f2996..123d59541 100644
--- a/tests/test_cyclic_nearest.py
+++ b/tests/test_cyclic_nearest.py
@@ -67,7 +67,7 @@ def find_nearest_latlon(self, grib_file, target_lat, target_lon):
 
         return nearest_points
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.internet
     def test_regular_grid(self):
         import pygribjump as gj
diff --git a/tests/test_ecmwf_oper_data_fdb.py b/tests/test_ecmwf_oper_data_fdb.py
index c08674638..a8fb750a7 100644
--- a/tests/test_ecmwf_oper_data_fdb.py
+++ b/tests/test_ecmwf_oper_data_fdb.py
@@ -42,7 +42,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -70,7 +70,7 @@ def test_fdb_datacube(self):
         assert len(result.leaves) == 3
         assert len(result.leaves[0].result) == 3
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_point(self):
         import pygribjump as gj
 
@@ -99,7 +99,7 @@ def test_fdb_datacube_point(self):
         assert set(result.leaves[0].flatten()["step"]) == set((0, 1))
         assert len(result.leaves[0].result) == 4
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_point_v2(self):
         import pygribjump as gj
 
@@ -127,7 +127,7 @@ def test_fdb_datacube_point_v2(self):
         assert len(result.leaves) == 3
         assert len(result.leaves[0].result) == 4
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_point_step_not_compressed(self):
         import pygribjump as gj
 
diff --git a/tests/test_engine_slicer.py b/tests/test_engine_slicer.py
index 5e79479e3..437d30d0f 100644
--- a/tests/test_engine_slicer.py
+++ b/tests/test_engine_slicer.py
@@ -46,18 +46,12 @@ def test_triangle(self):
         result = self.slicer.extract(datacube, triangle)
         result.pprint()
         assert len(result.leaves) == 10
-        # assert len(result.leaves) == 4
-        # total_leaves = 0
-        # for leaf in result.leaves:
-        #     total_leaves += len(leaf.values)
-        # assert total_leaves == 4 + 3 + 2 + 1
 
     def test_reusable(self):
         datacube = MockDatacube({"x": 100, "y": 100})
         polytopes = Polygon(["x", "y"], [[3, 3], [3, 6], [6, 3]]).polytope()
         result = self.slicer.extract(datacube, polytopes)
         result.pprint()
-        # assert len(result.leaves) == 4
         assert len(result.leaves) == 10
         polytopes = Box(["x", "y"], lower_corner=[3, 3], upper_corner=[6, 6]).polytope()
         result = self.slicer.extract(datacube, polytopes)
diff --git a/tests/test_fdb_datacube.py b/tests/test_fdb_datacube.py
index 777e60f42..2eeed2c77 100644
--- a/tests/test_fdb_datacube.py
+++ b/tests/test_fdb_datacube.py
@@ -46,7 +46,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -96,7 +96,7 @@ def test_fdb_datacube(self):
         # plt.colorbar(label="Temperature")
         # plt.show()
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_select_grid(self):
         import pygribjump as gj
 
diff --git a/tests/test_fdb_unmap_tree.py b/tests/test_fdb_unmap_tree.py
index bfc71f1ee..b2b255688 100644
--- a/tests/test_fdb_unmap_tree.py
+++ b/tests/test_fdb_unmap_tree.py
@@ -43,7 +43,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
diff --git a/tests/test_healpix_nested_grid.py b/tests/test_healpix_nested_grid.py
index 8d2108521..9b842d1f8 100644
--- a/tests/test_healpix_nested_grid.py
+++ b/tests/test_healpix_nested_grid.py
@@ -107,7 +107,7 @@ def setup_method(self, method):
         }
 
     @pytest.mark.internet
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.skip(reason="different fdb schema for climate dt")
     def test_healpix_nested_grid(self):
         import pygribjump as gj
diff --git a/tests/test_incomplete_tree_fdb.py b/tests/test_incomplete_tree_fdb.py
index b863dac2a..e9f871eaf 100644
--- a/tests/test_incomplete_tree_fdb.py
+++ b/tests/test_incomplete_tree_fdb.py
@@ -47,7 +47,7 @@ def setup_method(self, method):
         }
 
     @pytest.mark.internet
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_incomplete_fdb_branch(self):
         import pygribjump as gj
 
@@ -79,7 +79,7 @@ def test_incomplete_fdb_branch(self):
         assert result.is_root()
 
     @pytest.mark.internet
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_incomplete_fdb_branch_2(self):
         import pygribjump as gj
 
diff --git a/tests/test_local_grid_cyclic.py b/tests/test_local_grid_cyclic.py
index b30f0c2cf..1a3a72b91 100644
--- a/tests/test_local_grid_cyclic.py
+++ b/tests/test_local_grid_cyclic.py
@@ -49,7 +49,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -78,7 +78,7 @@ def test_fdb_datacube(self):
         assert result.leaves[0].flatten()["latitude"] == (-20,)
         assert result.leaves[0].flatten()["longitude"] == (-20,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_2(self):
         import pygribjump as gj
 
diff --git a/tests/test_local_regular_grid.py b/tests/test_local_regular_grid.py
index eee0525db..e6ce93f1f 100644
--- a/tests/test_local_regular_grid.py
+++ b/tests/test_local_regular_grid.py
@@ -48,7 +48,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -77,7 +77,7 @@ def test_fdb_datacube(self):
         assert result.leaves[0].flatten()["latitude"] == (0,)
         assert result.leaves[0].flatten()["longitude"] == (0,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region(self):
         import pygribjump as gj
 
@@ -106,7 +106,7 @@ def test_point_outside_local_region(self):
         assert result.leaves[0].flatten()["latitude"] == (0,)
         assert result.leaves[0].flatten()["longitude"] == (60,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_2(self):
         import pygribjump as gj
 
@@ -135,7 +135,7 @@ def test_point_outside_local_region_2(self):
         assert result.leaves[0].flatten()["latitude"] == (40,)
         assert result.leaves[0].flatten()["longitude"] == (1,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_3(self):
         import pygribjump as gj
 
@@ -163,7 +163,7 @@ def test_point_outside_local_region_3(self):
         assert len(result.leaves) == 1
         assert result.is_root()
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_4(self):
         import pygribjump as gj
 
@@ -191,7 +191,7 @@ def test_point_outside_local_region_4(self):
         assert len(result.leaves) == 1
         assert result.is_root()
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_5(self):
         import pygribjump as gj
 
@@ -219,7 +219,7 @@ def test_point_outside_local_region_5(self):
         assert len(result.leaves) == 1
         assert result.is_root()
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_6(self):
         import pygribjump as gj
 
@@ -247,7 +247,7 @@ def test_point_outside_local_region_6(self):
         assert len(result.leaves) == 1
         assert result.is_root()
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_7(self):
         import pygribjump as gj
 
@@ -276,7 +276,7 @@ def test_point_outside_local_region_7(self):
         assert result.leaves[0].flatten()["latitude"] == (-40,)
         assert result.leaves[0].flatten()["longitude"] == (1,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_8(self):
         import pygribjump as gj
 
@@ -305,7 +305,7 @@ def test_point_outside_local_region_8(self):
         assert result.leaves[0].flatten()["latitude"] == (-30,)
         assert result.leaves[0].flatten()["longitude"] == (-20,)
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_point_outside_local_region_9(self):
         import pygribjump as gj
 
diff --git a/tests/test_local_swiss_grid.py b/tests/test_local_swiss_grid.py
index 29001f7ad..349a9ab34 100644
--- a/tests/test_local_swiss_grid.py
+++ b/tests/test_local_swiss_grid.py
@@ -39,7 +39,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.skip("Non-accessible data")
     def test_fdb_datacube(self):
         import pygribjump as gj
diff --git a/tests/test_multiple_param_fdb.py b/tests/test_multiple_param_fdb.py
index 7bbb18e06..07466b78b 100644
--- a/tests/test_multiple_param_fdb.py
+++ b/tests/test_multiple_param_fdb.py
@@ -42,7 +42,6 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    # @pytest.mark.fdb
     @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
diff --git a/tests/test_point_nearest.py b/tests/test_point_nearest.py
index 75edf041b..b78fcd88b 100644
--- a/tests/test_point_nearest.py
+++ b/tests/test_point_nearest.py
@@ -43,7 +43,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -69,7 +69,7 @@ def test_fdb_datacube(self):
         result = self.API.retrieve(request)
         assert len(result.leaves) == 1
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_true_point(self):
         import pygribjump as gj
 
@@ -96,7 +96,7 @@ def test_fdb_datacube_true_point(self):
         # result.pprint()
         assert len(result.leaves) == 1
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_true_point_2(self):
         import pygribjump as gj
 
@@ -123,7 +123,7 @@ def test_fdb_datacube_true_point_2(self):
         result.pprint()
         assert len(result.leaves) == 1
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_true_point_3(self):
         import pygribjump as gj
 
@@ -152,7 +152,7 @@ def test_fdb_datacube_true_point_3(self):
         assert result.leaves[0].values == (359.929906542056,)
         assert result.leaves[0].axis.name == "longitude"
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_true_point_5(self):
         import pygribjump as gj
 
@@ -181,7 +181,7 @@ def test_fdb_datacube_true_point_5(self):
         assert result.leaves[0].values == (359.929906542056,)
         assert result.leaves[0].axis.name == "longitude"
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_true_point_4(self):
         import pygribjump as gj
 
diff --git a/tests/test_reduced_ll_grid.py b/tests/test_reduced_ll_grid.py
index d554e528e..b2c2e773a 100644
--- a/tests/test_reduced_ll_grid.py
+++ b/tests/test_reduced_ll_grid.py
@@ -50,7 +50,7 @@ def setup_method(self, method):
 
     @pytest.mark.skip(reason="wave data grid packing not supported")
     @pytest.mark.internet
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_reduced_ll_grid(self):
         import pygribjump as gj
 
diff --git a/tests/test_regular_grid.py b/tests/test_regular_grid.py
index 45e2803df..8136adff4 100644
--- a/tests/test_regular_grid.py
+++ b/tests/test_regular_grid.py
@@ -49,7 +49,7 @@ def setup_method(self, method):
             ],
         }
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.internet
     def test_regular_grid(self):
         import pygribjump as gj
diff --git a/tests/test_shapes.py b/tests/test_shapes.py
index ee17e6b22..4c49c691b 100644
--- a/tests/test_shapes.py
+++ b/tests/test_shapes.py
@@ -46,7 +46,7 @@ def test_all_cyclic(self):
         path = result.leaves[0].flatten()
         assert path["longitude"] == tuple(range(0, 360))
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_all_mapper_cyclic(self):
         import pygribjump as gj
 
diff --git a/tests/test_slice_date_range_fdb.py b/tests/test_slice_date_range_fdb.py
index 80d5c96e1..6541479b8 100644
--- a/tests/test_slice_date_range_fdb.py
+++ b/tests/test_slice_date_range_fdb.py
@@ -43,7 +43,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -73,7 +73,7 @@ def test_fdb_datacube(self):
         for i in range(len(result.leaves)):
             assert len(result.leaves[i].result) == 3
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_select_non_existing_last(self):
         import pygribjump as gj
 
@@ -103,7 +103,7 @@ def test_fdb_datacube_select_non_existing_last(self):
         for i in range(len(result.leaves)):
             assert len(result.leaves[i].result) == 3
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_select_non_existing_first(self):
         import pygribjump as gj
 
@@ -133,7 +133,7 @@ def test_fdb_datacube_select_non_existing_first(self):
         for i in range(len(result.leaves)):
             assert len(result.leaves[i].result) == 3
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_select_completely_non_existing(self):
         import pygribjump as gj
 
@@ -163,7 +163,7 @@ def test_fdb_datacube_select_completely_non_existing(self):
         for i in range(len(result.leaves)):
             assert len(result.leaves[i].result) == 0
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_disk(self):
         import pygribjump as gj
 
@@ -195,7 +195,7 @@ def test_fdb_datacube_disk(self):
         assert len(result.leaves[0].values) == 3
         assert len(result.leaves[1].values) == 3
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_disk_2(self):
         import pygribjump as gj
 
diff --git a/tests/test_slice_date_range_fdb_v2.py b/tests/test_slice_date_range_fdb_v2.py
index c75a2ca7d..e62024dda 100644
--- a/tests/test_slice_date_range_fdb_v2.py
+++ b/tests/test_slice_date_range_fdb_v2.py
@@ -46,7 +46,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.skip(reason="gribjump problem")
     def test_fdb_datacube(self):
         import pygribjump as gj
diff --git a/tests/test_slice_fdb_box.py b/tests/test_slice_fdb_box.py
index aa65edf7e..840df63df 100644
--- a/tests/test_slice_fdb_box.py
+++ b/tests/test_slice_fdb_box.py
@@ -48,7 +48,7 @@ def setup_method(self, method):
 
     # Testing different shapes
     # @pytest.mark.skip(reason="optimisation test")
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
diff --git a/tests/test_tree_protobuf_encoding.py b/tests/test_tree_protobuf_encoding.py
index 7497453d4..fe51c9e84 100644
--- a/tests/test_tree_protobuf_encoding.py
+++ b/tests/test_tree_protobuf_encoding.py
@@ -45,7 +45,7 @@ def setup_method(self):
             "timedelta_ax": grandchild_ax3,
         }
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_encoding(self):
         import pygribjump as gj
 
diff --git a/tests/test_tree_protobuf_encoding_fdb.py b/tests/test_tree_protobuf_encoding_fdb.py
index 7cef1070e..eec4e482c 100644
--- a/tests/test_tree_protobuf_encoding_fdb.py
+++ b/tests/test_tree_protobuf_encoding_fdb.py
@@ -8,7 +8,7 @@ class TestEncoder:
     def setup_method(self):
         pass
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_encoding(self):
         import pygribjump as gj
 
diff --git a/tests/test_union_gj.py b/tests/test_union_gj.py
index 30f22fc54..774572dce 100644
--- a/tests/test_union_gj.py
+++ b/tests/test_union_gj.py
@@ -43,7 +43,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube(self):
         import pygribjump as gj
 
@@ -84,7 +84,7 @@ def test_fdb_datacube(self):
         assert total_lons == 16
         assert total_vals == 16
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_complete_overlap(self):
         import pygribjump as gj
 
@@ -125,7 +125,7 @@ def test_fdb_datacube_complete_overlap(self):
         assert total_lons == 9
         assert total_vals == 9
 
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     def test_fdb_datacube_complete_overlap_v2(self):
         import pygribjump as gj
 
diff --git a/tests/test_union_point_box.py b/tests/test_union_point_box.py
index 7b7d1152d..8bce87e53 100644
--- a/tests/test_union_point_box.py
+++ b/tests/test_union_point_box.py
@@ -43,7 +43,7 @@ def setup_method(self, method):
         }
 
     # Testing different shapes
-    @pytest.mark.fdb
+    @pytest.mark.xfail
     @pytest.mark.skip(reason="point and box are not same dimensions")
     def test_fdb_datacube(self):
         import pygribjump as gj