diff --git a/python/dune/codegen/options.py b/python/dune/codegen/options.py
index 7f48ba583ee2e59d5294016da6671195705a4df8..bb6bbafaf09dd0b0ae7330b174dfa5805769d09f 100644
--- a/python/dune/codegen/options.py
+++ b/python/dune/codegen/options.py
@@ -186,7 +186,6 @@ def process_form_options(opt, form):
 
     if opt.blockstructured:
         opt = opt.copy(accumulation_mixins="blockstructured",
-                       geometry_mixins="blockstructured",
                        quadrature_mixins="blockstructured",
                        basis_mixins="blockstructured"
                        )
diff --git a/test/blockstructured/nonlinear/nonlinear.mini b/test/blockstructured/nonlinear/nonlinear.mini
index 5e9835a0311a98e815e7c54e51a02714b3bef9ee..29d8d531c8a15967f2673ff5a1b9326ab832fae9 100644
--- a/test/blockstructured/nonlinear/nonlinear.mini
+++ b/test/blockstructured/nonlinear/nonlinear.mini
@@ -14,3 +14,4 @@ compare_l2errorsquared = 6e-4
 [formcompiler.r]
 blockstructured = 1
 number_of_blocks = 5
+geometry_mixins = blockstructured_equidistant
diff --git a/test/blockstructured/poisson/poisson.mini b/test/blockstructured/poisson/poisson.mini
index a3a1ff0545f378fe1bed3efefb8911b3645d269f..1d7df30a14d0436c1337734f263a5894d528820f 100644
--- a/test/blockstructured/poisson/poisson.mini
+++ b/test/blockstructured/poisson/poisson.mini
@@ -16,6 +16,7 @@ compare_l2errorsquared = 1e-7
 numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 3
+geometry_mixins = blockstructured_equidistant
 
 [formcompiler.ufl_variants]
 cell = quadrilateral
diff --git a/test/blockstructured/poisson/poisson_matrix_free.mini b/test/blockstructured/poisson/poisson_matrix_free.mini
index 3a76151cdc4d6efe9c069e87c67417063e655c57..514ab95b79ea5febb48da6d4a610c9abbb4d5ba4 100644
--- a/test/blockstructured/poisson/poisson_matrix_free.mini
+++ b/test/blockstructured/poisson/poisson_matrix_free.mini
@@ -15,6 +15,7 @@ compare_l2errorsquared = 1e-7
 matrix_free = 1
 blockstructured = 1
 number_of_blocks = 4
+geometry_mixins = blockstructured_equidistant
 
 [formcompiler.ufl_variants]
 cell = quadrilateral
diff --git a/test/blockstructured/poisson/poisson_neumann.mini b/test/blockstructured/poisson/poisson_neumann.mini
index 1512f88bc1ba25141e121de948da3aed06933b97..26e75dd9cd63ec92179434d4bec5d9e288cc9566 100644
--- a/test/blockstructured/poisson/poisson_neumann.mini
+++ b/test/blockstructured/poisson/poisson_neumann.mini
@@ -16,3 +16,4 @@ compare_l2errorsquared = 1e-8
 numerical_jacobian = 1, 0 | expand num
 blockstructured = 1
 number_of_blocks = 4
+geometry_mixins = blockstructured_equidistant
diff --git a/test/blockstructured/poisson/poisson_tensor.mini b/test/blockstructured/poisson/poisson_tensor.mini
index 2923263610d8260066e2809090b64ce2d10948c9..4a737cc9b20f034ccd2d9856d17d9e815c6c987f 100644
--- a/test/blockstructured/poisson/poisson_tensor.mini
+++ b/test/blockstructured/poisson/poisson_tensor.mini
@@ -27,6 +27,7 @@ vectorization_blockstructured = 0, 1 | expand vectorized
 generate_jacobians = 0
 blockstructured = 1
 number_of_blocks = 8, 4 | expand dimension
+geometry_mixins = blockstructured_equidistant
 
 [formcompiler.ufl_variants]
 cell = quadrilateral, hexahedron | expand dimension
diff --git a/test/blockstructured/poisson/poisson_vec.mini b/test/blockstructured/poisson/poisson_vec.mini
index 9ec5cb244d9e56ca31eb3fe67ecf1c45d6e88f24..7b132230b5ab54469d227389eea0b9ba94c78f4a 100644
--- a/test/blockstructured/poisson/poisson_vec.mini
+++ b/test/blockstructured/poisson/poisson_vec.mini
@@ -21,6 +21,7 @@ generate_jacobians = 0
 blockstructured = 1
 number_of_blocks = 16, 8 | expand dimension
 vectorization_blockstructured = 1
+geometry_mixins = blockstructured_equidistant
 
 [formcompiler.ufl_variants]
 cell = quadrilateral, hexahedron | expand dimension
diff --git a/test/blockstructured/stokes/stokes.mini b/test/blockstructured/stokes/stokes.mini
index 532a4159b6b6019525acdea50da3c18f14e22f9a..251f8a842ab4f6940c4a7015982d00ea3947f2ba 100644
--- a/test/blockstructured/stokes/stokes.mini
+++ b/test/blockstructured/stokes/stokes.mini
@@ -16,3 +16,4 @@ compare_l2errorsquared = 1e-9
 numerical_jacobian = 0, 1 | expand num
 blockstructured = 1
 number_of_blocks = 3
+geometry_mixins = blockstructured_equidistant