diff --git a/test/implicit/2pni/CMakeLists.txt b/test/implicit/2pni/CMakeLists.txt
deleted file mode 100644
index 22dc507c15711a5fb53a5261ae56a897ffeb18f2..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-add_dumux_test(test_box2pni test_box2pni test_box2pni.cc
- ${CMAKE_SOURCE_DIR}/bin/runTest.sh
- ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
- ${CMAKE_SOURCE_DIR}/test/references/injection2pnibox-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnibox-00009.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_box2pni)
-
-add_dumux_test(test_cc2pni test_cc2pni test_cc2pni.cc
- ${CMAKE_SOURCE_DIR}/bin/runTest.sh
- ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
- ${CMAKE_SOURCE_DIR}/test/references/injection2pnicc-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/injection2pnicc-00009.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/test_cc2pni)
diff --git a/test/implicit/2pni/Makefile.am b/test/implicit/2pni/Makefile.am
deleted file mode 100644
index 3660056a81406fc25fc9bec35d2b7bdf44464ecf..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-check_PROGRAMS = test_box2pni test_cc2pni
-
-noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
-
-test_box2pni_SOURCES = test_box2pni.cc
-test_cc2pni_SOURCES = test_cc2pni.cc
-
-include $(top_srcdir)/am/global-rules
diff --git a/test/implicit/2pni/grids/test_2pni.dgf b/test/implicit/2pni/grids/test_2pni.dgf
deleted file mode 100644
index 765233c04aefb8d90f24a0ec8bffdf6763e8bbb7..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/grids/test_2pni.dgf
+++ /dev/null
@@ -1,10 +0,0 @@
-DGF
-Interval
-0 0 % first corner
-60 40 % second corner
-24 16 % 24 cells in x and 16 in y direction
-#
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/implicit/2pni/test_box2pni.cc b/test/implicit/2pni/test_box2pni.cc
deleted file mode 100644
index 088c422b0181e619153aa96cf6050113e73773d7..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/test_box2pni.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- 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 2pni box model
- */
-#include "config.h"
-
-#include "injectionproblem2pni.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.NumberOfCellsX Resolution in x-direction [-]\n"
- "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n"
- "\t-Grid.UpperRightX Length of the domain [m]\n"
- "\t-Grid.UpperRightY Height of the domain [m]\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(InjectionBoxProblem2PNI) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/implicit/2pni/test_box2pni.input b/test/implicit/2pni/test_box2pni.input
deleted file mode 100644
index 9ad979da3763813082219aabb47779036ed610d2..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/test_box2pni.input
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################
-# Parameter file for test_2pni.
-# Everything behind a '#' is a comment.
-# Type "./test_2pni --help" for more information.
-###############################################################
-
-###############################################################
-# Mandatory arguments
-###############################################################
-
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 1e4 # [s]
-
-[Grid]
-NumberOfCellsX = 24 # [-] resolution in x-direction
-NumberOfCellsY = 16 # [-] resolution in y-direction
-
-UpperRightX = 60 # [m] length of the domain
-UpperRightY = 40 # [m] height of the domain
-
-[Problem]
-Name = injection2pnibox
-
-###############################################################
-# Simulation restart
-#
-# DuMux simulations can be restarted from *.drs files
-# Set Restart to the value of a specific file,
-# e.g.: 'Restart = 27184.1' for the restart file
-# name_time=27184.1_rank=0.drs
-# Please comment in the two lines below, if restart is desired.
-###############################################################
-# [TimeManager]
-# Restart = ...
diff --git a/test/implicit/2pni/test_cc2pni.cc b/test/implicit/2pni/test_cc2pni.cc
deleted file mode 100644
index d4c0c4e33ee476522fcefcb04e3f3ee5e082c8ea..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/test_cc2pni.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-// -*- 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 2pni CC model
- */
-#include "config.h"
-
-#include "injectionproblem2pni.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.NumberOfCellsX Resolution in x-direction [-]\n"
- "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n"
- "\t-Grid.UpperRightX Length of the domain [m]\n"
- "\t-Grid.UpperRightY Height of the domain [m]\n";
-
- std::cout << errorMessageOut
- << "\n";
- }
-}
-
-////////////////////////
-// the main function
-////////////////////////
-int main(int argc, char** argv)
-{
- typedef TTAG(InjectionCCProblem2PNI) ProblemTypeTag;
- return Dumux::start<ProblemTypeTag>(argc, argv, usage);
-}
diff --git a/test/implicit/2pni/test_cc2pni.input b/test/implicit/2pni/test_cc2pni.input
deleted file mode 100644
index 6eebc393990ad417725c6e7a6630db4288b0944f..0000000000000000000000000000000000000000
--- a/test/implicit/2pni/test_cc2pni.input
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################
-# Parameter file for test_2pni.
-# Everything behind a '#' is a comment.
-# Type "./test_2pni --help" for more information.
-###############################################################
-
-###############################################################
-# Mandatory arguments
-###############################################################
-
-[TimeManager]
-DtInitial = 250 # [s]
-TEnd = 1e4 # [s]
-
-[Grid]
-NumberOfCellsX = 24 # [-] resolution in x-direction
-NumberOfCellsY = 16 # [-] resolution in y-direction
-
-UpperRightX = 60 # [m] length of the domain
-UpperRightY = 40 # [m] height of the domain
-
-[Problem]
-Name = injection2pnicc
-
-###############################################################
-# Simulation restart
-#
-# DuMux simulations can be restarted from *.drs files
-# Set Restart to the value of a specific file,
-# e.g.: 'Restart = 27184.1' for the restart file
-# name_time=27184.1_rank=0.drs
-# Please comment in the two lines below, if restart is desired.
-###############################################################
-# [TimeManager]
-# Restart = ...