diff --git a/test/averagedistanceassemblertest.cc b/test/averagedistanceassemblertest.cc
index 0f49c4a40b4e511cd225eeec82fe5490f692a5ae..5aa37cc1d06755541bbf6d4f8f3ce2db1901c458 100644
--- a/test/averagedistanceassemblertest.cc
+++ b/test/averagedistanceassemblertest.cc
@@ -66,7 +66,7 @@ void testWeightSet(const std::vector<TargetSpace>& corners,
     int quadOrder = 3;
     
     const Dune::QuadratureRule<double, dim>& quad 
-        = Dune::QuadratureRules<double, dim>::rule(GeometryType(GeometryType::simplex,dim), quadOrder);
+        = Dune::QuadratureRules<double, dim>::rule(GeometryTypes::simplex(dim), quadOrder);
     
     for (size_t pt=0; pt<quad.size(); pt++) {
         
diff --git a/test/localgfetestfunctiontest.cc b/test/localgfetestfunctiontest.cc
index 34ff67bd04925db55a010a159cde2b219795d8f0..4b9769c95f7348e66363ed16f9eaa88d8ec5ae38 100644
--- a/test/localgfetestfunctiontest.cc
+++ b/test/localgfetestfunctiontest.cc
@@ -40,15 +40,12 @@ void test()
     PQkLocalFiniteElementCache<double,double,domainDim,1> feCache;
     typedef typename PQkLocalFiniteElementCache<double,double,domainDim,1>::FiniteElementType LocalFiniteElement;
     
-    GeometryType simplex;
-    simplex.makeSimplex(domainDim);
-
     for (int i=0; i<numIndices; i++, ++index) {
         
         for (int j=0; j<domainDim+1; j++)
             coefficients[j] = testPoints[index[j]];
 
-        LocalGfeTestFunctionFiniteElement<LocalFiniteElement,TargetSpace> testFunctionSet(feCache.get(simplex),coefficients);
+        LocalGfeTestFunctionFiniteElement<LocalFiniteElement,TargetSpace> testFunctionSet(feCache.get(GeometryTypes::simplex(domainDim)),coefficients);
         
         FieldVector<double,domainDim> stupidTestPoint(0);