diff --git a/doc/doxygen/modules.txt b/doc/doxygen/modules.txt
index 86cbf92f69d35774f82c80451253dfd92ea492f6..e742d9fec9fd2be1db143e4e82bff552f7f39c6d 100644
--- a/doc/doxygen/modules.txt
+++ b/doc/doxygen/modules.txt
@@ -190,6 +190,7 @@
  	 */
  	/*! \ingroup BenchmarksAndTests
  	 * \defgroup TwoPTwoCTests 2p2c (two phase, two component) benchmarks and tests
+ 	 * TwoPTwoCTests contain various tests using a TwoPTwoCModel. The files are listed below, with hopefully self-explanatory names.
  	 */
  	/*! \ingroup BenchmarksAndTests
  	 * \defgroup TwoPNCTests 2pnc (two phase, n-component) benchmarks and tests
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index 57d5c6a9995b9e6c5fd15c8f10180b938711996d..680d83176a969af211ea2fd70331242217fd4ca4 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup TwoPTwoCTests
  * \brief Problem where air is injected under a low permeable layer in a depth of 2700m.
  */
 #ifndef DUMUX_INJECTION_PROBLEM_HH
@@ -64,8 +64,7 @@ SET_BOOL_PROP(InjectionTypeTag, UseMoles, true);
 
 
 /*!
- * \ingroup TwoPTwoCModel
- * \ingroup ImplicitTestProblems
+ * \ingroup TwoPTwoCTests
  * \brief Problem where air is injected under a low permeable layer in a depth of 2700m.
  *
  * The domain is sized 60m times 40m and consists of two layers, a moderately
diff --git a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
index 5c0a1fe44635632f83a65772cc41603be2a821fb..e7ee572c4f54474ca10f0a0cacc1b2e5f8b51318 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionspatialparams.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup TwoPTwoCTests
  * \brief Definition of the spatial parameters for the injection problem
  *        which uses the isothermal two-phase two-component
  *        fully implicit model.
@@ -53,8 +53,7 @@ SET_TYPE_PROP(InjectionSpatialParams,
 }
 
 /*!
- * \ingroup TwoPTwoCModel
- * \ingroup ImplicitTestProblems
+ * \ingroup TwoPTwoCTests
  * \brief Definition of the spatial parameters for the injection problem
  *        which uses the isothermal two-phase two-component
  *        fully implicit model.
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 8e19a4831b925773a692b5b4c8f3902104483fb6..d61b8c7eb45fc30e08726020f3c4e9201d61d082 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup TwoPTwoCTests
  * \brief Non-isothermal gas injection problem where a gas (e.g. air)
  *        is injected into a fully water saturated medium.
  */
@@ -38,6 +38,11 @@
 
 namespace Dumux
 {
+/*!
+ * \ingroup TwoPTwoCTests
+ * \brief Non-isothermal gas injection problem where a gas (e.g. air)
+ *        is injected into a fully water saturated medium.
+ */
 template <class TypeTag>
 class WaterAirProblem;
 
diff --git a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
index 11881601e42e388e30799b832331af254c92d5a7..0f1bc76868fa3c76c73452244e67d8276a76c283 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairspatialparams.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup TwoPTwoCTests
  * \brief Definition of the spatial parameters for the water-air problem.
  */
 #ifndef DUMUX_WATER_AIR_SPATIAL_PARAMS_HH
@@ -35,6 +35,10 @@
 namespace Dumux
 {
 
+/*!
+ * \ingroup TwoPTwoCTests
+ * \brief Definition of the spatial parameters for the water-air problem.
+ */
 //forward declaration
 template<class TypeTag>
 class WaterAirSpatialParams;
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index f28cfbd36a6e98b665325cc8e42431894287b515..f098d2c2ad99639a8960997982575d4cb8f801d1 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup SequentialTwoPTwoCTests
  * \brief Test problem for the adaptive sequential 2p2c model in 2D
  */
 #ifndef DUMUX_TEST_ADAPTIVE2D_2P2C_PROBLEM_HH
@@ -36,7 +36,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup SequentialTwoPTwoCTests
+ * \brief Test problem for the adaptive sequential 2p2c model in 2D
+ */
 template<class TypeTag>
 class Adaptive2p2c2d;
 
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 3fbeaad65e1f234d15b45f93976c35c94cc61147..d006ac41516f6aa5e7543e4f4e53fdcd54f702c2 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup SequentialTwoPTwoCTests
  * \brief test problem for the grid-adaptive 3d 2p2c model
  */
 #ifndef DUMUX_TEST_ADAPTIVE3D_2P2C_PROBLEM_HH
@@ -35,7 +35,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup SequentialTwoPTwoCTests
+ * \brief test problem for the grid-adaptive 3d 2p2c model
+ */
 template<class TypeTag>
 class Adaptive2p2c3d;
 
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
index 6d042b2634134fdd267b10a2fe0f678c2cf8db15..e02c695ff053e7b4448ff0117380173257938341 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2c_spatialparams.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup SequentialTwoPTwoCTests
  * \brief spatial parameters for the sequential 2p2c test
  */
 #ifndef TEST_2P2C_SPATIALPARAMS_HH
@@ -55,7 +55,7 @@ public:
 }
 
 /*!
- * \ingroup IMPETtests
+ * \ingroup SequentialTwoPTwoCTests
  * \brief spatial parameters for the sequential 2p2c test
  */
 template<class TypeTag>
diff --git a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
index 575406d309f9120bbe73f56689c9f3d64c220dac..59ee826bf93e4e1d4f72e5044610ef5429d55051 100644
--- a/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_dec2p2cproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup SequentialTwoPTwoCTests
  * \brief test problem for the sequential 2p2c model
  */
 #ifndef DUMUX_TEST_2P2C_PROBLEM_HH
@@ -35,7 +35,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup SequentialTwoPTwoCTests
+ * \brief test problem for the sequential 2p2c model
+ */
 template<class TypeTag>
 class TestDecTwoPTwoCProblem;
 
diff --git a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
index d2b8a9224d5ce3a209f010c39c4708d345a5fefb..3bf316b640dcf8dcbe105ffa606c59d1b9954bcc 100644
--- a/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_multiphysics2p2cproblem.hh
@@ -18,7 +18,7 @@
  *****************************************************************************/
 /*!
  * \file
- *
+ * \ingroup SequentialTwoPTwoCTests
  * \brief test problem for the multiphysics 2p2c model
  */
 #ifndef DUMUX_TEST_2P2C_PROBLEM_HH
@@ -36,7 +36,10 @@
 
 namespace Dumux
 {
-
+/*!
+ * \ingroup SequentialTwoPTwoCTests
+ * \brief test problem for the multiphysics 2p2c model
+ */
 template<class TypeTag>
 class TestMultTwoPTwoCProblem;