diff --git a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
index 460c5c14f84abd366538630268d8e2ad5ca51cec..787b3408ce17d074c5c3114ce11cca3e3fddae6f 100644
--- a/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
+++ b/test/navier-stokes/navierstokes_2d_dg_quadrilateral.mini
@@ -23,13 +23,14 @@ l2error_tree_path = 1, 1, 0
 explicit_time_stepping = 0
 yaspgrid_offset = 1
 overlapping = 1
-geometry_mixins = equidistant
 
 [formcompiler.mass]
 numerical_jacobian = 0, 1 | expand num
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 0, 1 | expand num
+geometry_mixins = equidistant
 
 [instat]
 T = 1e-2
diff --git a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
index 968e989446021d2ee402e66ae2c30954d451fb29..c0bf23eadb1b5238d94424a424217a1b5ffc616f 100644
--- a/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
+++ b/test/navier-stokes/navierstokes_3d_dg_quadrilateral.mini
@@ -18,13 +18,14 @@ compare_l2errorsquared = 5e-4
 # Only calculate error for the velocity part
 l2error_tree_path = 1, 1, 1, 0
 operators = mass, r
-geometry_mixins = equidistant
 
 [formcompiler.mass]
 numerical_jacobian = 0, 1 | expand num
+geometry_mixins = equidistant
 
 [formcompiler.r]
 numerical_jacobian = 0, 1 | expand num
+geometry_mixins = equidistant
 
 [instat]
 T = 5e-2
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
index 2bdf91746cece93d09164fa3b167a91faf57c541..7cc6619beb1761050f15e9a71b5f78078838e36f 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_cg_quadrilateral.mini
@@ -9,4 +9,6 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 9e-8
+
+[formcompiler.r]
 geometry_mixins = equidistant
diff --git a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
index 6b4182ceb1aba6f4a996dab8927c7c7bb4b2a58a..a4478b53e9f399fab159dead0010286d0c9cc6a3 100644
--- a/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
+++ b/test/poisson/dimension-grid-variations/poisson_2d_dg_quadrilateral.mini
@@ -9,4 +9,6 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 6e-7
+
+[formcompiler.r]
 geometry_mixins = equidistant
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
index 9365f433eef256bada9b3dabd087db20b41fba63..23bc16ba4b87ef9381aedbf8e3fb773e02dc5ae0 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_cg_hexahedron.mini
@@ -9,4 +9,6 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 9e-5
+
+[formcompiler.r]
 geometry_mixins = equidistant
diff --git a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
index fa0b3a6db82c1ae68923d1a4f0393136a9405aae..3c8ebda08525392d88eb1a900572616cd40052e4 100644
--- a/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
+++ b/test/poisson/dimension-grid-variations/poisson_3d_dg_hexahedron.mini
@@ -9,4 +9,6 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-4
+
+[formcompiler.r]
 geometry_mixins = equidistant
diff --git a/test/poisson/poisson_dg_tensor.mini b/test/poisson/poisson_dg_tensor.mini
index c799f45db355993cba3421736af5b75fcbc8ae0d..e73c1ebff8b536644c7aefce95451854ea97b9c1 100644
--- a/test/poisson/poisson_dg_tensor.mini
+++ b/test/poisson/poisson_dg_tensor.mini
@@ -13,7 +13,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 4e-6
-geometry_mixins = equidistant
 
 [formcompiler.r]
-numerical_jacobian = 1, 0 | expand num
\ No newline at end of file
+numerical_jacobian = 1, 0 | expand num
+geometry_mixins = equidistant
\ No newline at end of file
diff --git a/test/stokes/stokes_3d_dg_quadrilateral.mini b/test/stokes/stokes_3d_dg_quadrilateral.mini
index 8cb5d51d991b9555c8f2f5494e23fcd4682c7285..18bd43c75cb65131496e7ecd2beaff69999612c3 100644
--- a/test/stokes/stokes_3d_dg_quadrilateral.mini
+++ b/test/stokes/stokes_3d_dg_quadrilateral.mini
@@ -11,7 +11,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 6e-8
-geometry_mixins = equidistant
 
 [formcompiler.r]
+geometry_mixins = equidistant
 numerical_jacobian = 0, 1 | expand num
diff --git a/test/stokes/stokes_3d_quadrilateral.mini b/test/stokes/stokes_3d_quadrilateral.mini
index ecf02f5730606f9c27507f1cc39c340043558357..d008c6363ccd2381848c09976450d6db2e810001 100644
--- a/test/stokes/stokes_3d_quadrilateral.mini
+++ b/test/stokes/stokes_3d_quadrilateral.mini
@@ -12,7 +12,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-10
-geometry_mixins = equidistant
 
 [formcompiler.r]
+geometry_mixins = equidistant
 numerical_jacobian = 1, 0 | expand num
diff --git a/test/stokes/stokes_dg_quadrilateral.mini b/test/stokes/stokes_dg_quadrilateral.mini
index e91ad9c891f40c04300eb8373d648cbf7b6abcd7..5a1fb4127984eb1b60027247e23efa03e6eacc92 100644
--- a/test/stokes/stokes_dg_quadrilateral.mini
+++ b/test/stokes/stokes_dg_quadrilateral.mini
@@ -11,7 +11,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-8
-geometry_mixins = equidistant
 
 [formcompiler.r]
+geometry_mixins = equidistant
 numerical_jacobian = 0, 1 | expand num
diff --git a/test/stokes/stokes_quadrilateral.mini b/test/stokes/stokes_quadrilateral.mini
index 6954f2278d96f5cc2e7fc80c3fbf14e6207a0554..cdaa55d544dd29c6354190291e12704e610ee064 100644
--- a/test/stokes/stokes_quadrilateral.mini
+++ b/test/stokes/stokes_quadrilateral.mini
@@ -12,7 +12,7 @@ extension = vtu
 
 [formcompiler]
 compare_l2errorsquared = 1e-10
-geometry_mixins = equidistant
 
 [formcompiler.r]
+geometry_mixins = equidistant
 numerical_jacobian = 1, 0 | expand num