diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc
new file mode 100644
index 0000000000000000000000000000000000000000..62a2fb3a496eabb695531f0a68483b2ce0b1427a
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.cc
@@ -0,0 +1,58 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the 1pni CC model
+ */
+#include <config.h>
+#include "1pniconductionproblem.hh"
+#include <dumux/common/start.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n";
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(OnePNIConductionCCMpfaProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input
new file mode 100644
index 0000000000000000000000000000000000000000..145db6013982bbd428f112cf50b0b4fe068ddc64
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconduction.input
@@ -0,0 +1,17 @@
+[TimeManager]
+DtInitial = 1 # [s]
+TEnd = 1e5 # [s]
+MaxTimeStepSize = 1e10
+
+[Grid]
+LowerLeft = 0 0
+UpperRight = 5 1
+Cells = 200 1
+
+[Problem]
+Name = ccmpfa1pniconduction # name passed to the output routines
+OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
+
+[Vtk]
+AddVelocity= 0 # enable velocity output
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc
new file mode 100644
index 0000000000000000000000000000000000000000..0c57aa535108ca5e0cc7a6cdf1b4c6d1dc1b3df1
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.cc
@@ -0,0 +1,58 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*****************************************************************************
+ * See the file COPYING for full copying permissions. *
+ * *
+ * This program is free software: you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License as published by *
+ * the Free Software Foundation, either version 2 of the License, or *
+ * (at your option) any later version. *
+ * *
+ * This program is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
+ * GNU General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU General Public License *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
+ *****************************************************************************/
+/*!
+ * \file
+ *
+ * \brief test for the 1pni CC model
+ */
+#include <config.h>
+#include "1pniconvectionproblem.hh"
+#include <dumux/common/start.hh>
+
+/*!
+ * \brief Provides an interface for customizing error messages associated with
+ * reading in parameters.
+ *
+ * \param progName The name of the program, that was tried to be started.
+ * \param errorMsg The error message that was issued by the start function.
+ * Comprises the thing that went wrong and a general help message.
+ */
+void usage(const char *progName, const std::string &errorMsg)
+{
+ if (errorMsg.size() > 0) {
+ std::string errorMessageOut = "\nUsage: ";
+ errorMessageOut += progName;
+ errorMessageOut += " [options]\n";
+ errorMessageOut += errorMsg;
+ errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
+ "\t-TimeManager.TEnd End of the simulation [s] \n"
+ "\t-TimeManager.DtInitial Initial timestep size [s] \n"
+ "\t-Grid.LowerLeft Lower left corner coordinates\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n"
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n";
+ std::cout << errorMessageOut
+ << "\n";
+ }
+}
+
+int main(int argc, char** argv)
+{
+ typedef TTAG(OnePNIConvectionCCMpfaProblem) ProblemTypeTag;
+ return Dumux::start<ProblemTypeTag>(argc, argv, usage);
+}
diff --git a/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input
new file mode 100644
index 0000000000000000000000000000000000000000..5794931580dd78e8e0faf05b5d9fba61f4673598
--- /dev/null
+++ b/test/porousmediumflow/1p/implicit/test_ccmpfa1pniconvection.input
@@ -0,0 +1,18 @@
+[TimeManager]
+DtInitial = 1 # [s]
+TEnd = 3e4 # [s]
+MaxTimeStepSize = 1e3
+
+[Grid]
+LowerLeft = 0 0
+UpperRight = 20 1
+Cells = 80 1
+
+[Problem]
+Name = ccmpfa1pniconvection # name passed to the output routines
+OutputInterval = 5 # every 5th timestep an output file is written
+DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # Disable gravity
+
+[Vtk]
+AddVelocity = 0 # enable velocity output