diff --git a/test/boxmodels/1p/1ptestproblem.hh b/test/boxmodels/1p/1ptestproblem.hh
index 8f2799ca33e62613577f522238ccbf35cce69111..cfcc88f3f017f4b53981aae7c3d5657452b9d160 100644
--- a/test/boxmodels/1p/1ptestproblem.hh
+++ b/test/boxmodels/1p/1ptestproblem.hh
@@ -73,7 +73,7 @@ SET_PROP(OnePTestProblem, Grid)
 
 // Set the problem property
 SET_PROP(OnePTestProblem, Problem)
-{ typedef Dumux::OnePTestProblem<TTAG(OnePTestProblem)> type; };
+{ typedef Dumux::OnePTestProblem<TypeTag> type; };
 
 // Set the spatial parameters
 SET_PROP(OnePTestProblem, SpatialParameters)
@@ -110,7 +110,7 @@ SET_BOOL_PROP(OnePTestProblem, EnableGravity, true);
  * <tt>typedef Dune::SGrid<3,3> type;</tt> in the problem file
  * and use <tt>1p_3d.dgf</tt> in the parameter file.
  */
-template <class TypeTag = TTAG(OnePTestProblem) >
+template <class TypeTag>
 class OnePTestProblem : public OnePBoxProblem<TypeTag>
 {
     typedef OnePBoxProblem<TypeTag> ParentType;
diff --git a/test/boxmodels/1p2c/1p2coutflowproblem.hh b/test/boxmodels/1p2c/1p2coutflowproblem.hh
index 85ef93061cec330403b976ac3fb15d0a07e6ca2c..a4e7d32daad6c53af56bddaa594e8f3ac1069124 100644
--- a/test/boxmodels/1p2c/1p2coutflowproblem.hh
+++ b/test/boxmodels/1p2c/1p2coutflowproblem.hh
@@ -65,7 +65,7 @@ SET_PROP(OnePTwoCOutflowProblem, Grid)
 // Set the problem property
 SET_PROP(OnePTwoCOutflowProblem, Problem)
 {
-    typedef Dumux::OnePTwoCOutflowProblem<TTAG(OnePTwoCOutflowProblem)> type;
+    typedef Dumux::OnePTwoCOutflowProblem<TypeTag> type;
 };
 
 // Set fluid configuration
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index dd7f0b3e06f82cecd4b8c8b4b59b5958ddd613be..5d9cd8297a74741c31184601b97e154248d229e5 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -55,7 +55,7 @@ SET_PROP(InjectionProblem, Grid)
 // Set the problem property
 SET_PROP(InjectionProblem, Problem)
 {
-    typedef Dumux::InjectionProblem<TTAG(InjectionProblem)> type;
+    typedef Dumux::InjectionProblem<TypeTag> type;
 };
 
 // Set fluid configuration
@@ -92,7 +92,7 @@ SET_BOOL_PROP(InjectionProblem, EnableVelocityOutput, false);
  * To run the simulation execute the following line in shell:
  * <tt>./test_2p2c -parameterFile ./test_2p2c.input</tt>
  */
-template <class TypeTag = TTAG(InjectionProblem) >
+template <class TypeTag>
 class InjectionProblem : public TwoPTwoCProblem<TypeTag>
 {
     typedef TwoPTwoCProblem<TypeTag> ParentType;
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index bd61459fbda5ac4c25e2696e87015262972f4662..f89663542c4ca9ee562d1a07167666b3cc81ac3b 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_dec2p2cproblem.hh
@@ -127,7 +127,7 @@ SET_SCALAR_PROP(TestDecTwoPTwoCProblem, CFLFactor, 0.8);
  * To run the simulation execute the following line in shell:
  * <tt>./test_dec2p2c -parameterFile ./test_dec2p2c.input</tt>
  */
-template<class TypeTag = TTAG(TestDecTwoPTwoCProblem)>
+template<class TypeTag>
 class TestDecTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
 {
 typedef IMPETProblem2P2C<TypeTag> ParentType;
diff --git a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
index 5c9126d043a0ca405a267633397ae18dc9abc414..d1e6309bd4167116ea2f232e80d93952776649f1 100644
--- a/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
+++ b/test/decoupled/2p2c/test_multiphysics2p2cproblem.hh
@@ -135,7 +135,7 @@ SET_SCALAR_PROP(TestMultTwoPTwoCProblem, CFLFactor, 0.8);
  * Optionally, simulation endtime and first timestep size can be
  * specified by programm arguments.
  */
-template<class TypeTag = TTAG(TestMultTwoPTwoCProblem)>
+template<class TypeTag>
 class TestMultTwoPTwoCProblem: public IMPETProblem2P2C<TypeTag>
 {
 typedef IMPETProblem2P2C<TypeTag> ParentType;