diff --git a/python/dune/codegen/pdelab/basis.py b/python/dune/codegen/pdelab/basis.py
index b3c0d13226cffd17d0f5e2a26563edf2d230c0fd..15ca148ae8eb4b72c092f067a301ea1edc99b8e1 100644
--- a/python/dune/codegen/pdelab/basis.py
+++ b/python/dune/codegen/pdelab/basis.py
@@ -13,7 +13,9 @@ from dune.codegen.generation import (backend,
 from dune.codegen.options import (option_switch,
                                   get_form_option,
                                   )
-from dune.codegen.pdelab.argument import name_coefficientcontainer
+from dune.codegen.pdelab.argument import (name_applycontainer,
+                                          name_coefficientcontainer,
+                                          )
 from dune.codegen.pdelab.spaces import (lfs_iname,
                                         lfs_inames,
                                         name_leaf_lfs,
diff --git a/test/nonlinear/diffusivewave.mini b/test/nonlinear/diffusivewave.mini
index 7aa66686e28e4e6446dbbd39ef519b6c4fed7e36..e02ec95646d5838b95d3be5793adeebc4e060a72 100644
--- a/test/nonlinear/diffusivewave.mini
+++ b/test/nonlinear/diffusivewave.mini
@@ -15,12 +15,13 @@ T = 0.01
 
 [formcompiler]
 operators = mass, poisson
-geometry_mixins = equidistant
 
 [formcompiler.mass]
+geometry_mixins = equidistant, sumfact_equidistant | expand sf
 sumfact = 0, 1 | expand sf
 fastdg = 0, 0 | expand sf
 
 [formcompiler.operator]
+geometry_mixins = equidistant, sumfact_equidistant | expand sf
 sumfact = 0, 1 | expand sf
 fastdg = 0, 0 | expand sf