diff --git a/test/boxmodels/1p/Makefile.am b/test/boxmodels/1p/Makefile.am
index 8a237a65beb12d8150bdf7f06822755663e31177..4f7dc1df3fe629a4b4618884f7d192af1968daaa 100644
--- a/test/boxmodels/1p/Makefile.am
+++ b/test/boxmodels/1p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_1p
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_1p_SOURCES = test_1p.cc
 test_1p_CXXFLAGS = $(DUNEMPICPPFLAGS)  
diff --git a/test/boxmodels/1p2c/Makefile.am b/test/boxmodels/1p2c/Makefile.am
index 05ac04fff7d0533fc94fe5f9ae731d1ebb3253e3..959559d111bbfec326a80164576a748c9f859cc9 100644
--- a/test/boxmodels/1p2c/Makefile.am
+++ b/test/boxmodels/1p2c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_1p2c
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_1p2c_SOURCES = test_1p2c.cc
 
diff --git a/test/boxmodels/2p/Makefile.am b/test/boxmodels/2p/Makefile.am
index 4cb0b34f0f48cb52f61aaec4b645f0c5b6ccd9b3..569d0f449b0d17d2fcb670f34e1b09b15b2300b7 100644
--- a/test/boxmodels/2p/Makefile.am
+++ b/test/boxmodels/2p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_2p
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 
 test_2p_SOURCES = test_2p.cc
 
diff --git a/test/boxmodels/2p2c/Makefile.am b/test/boxmodels/2p2c/Makefile.am
index 9d441002d43b555806aa53a74b20582189c9ea59..3810f13ca3ae9c3e3a38c953d529f2fe85a46aa6 100644
--- a/test/boxmodels/2p2c/Makefile.am
+++ b/test/boxmodels/2p2c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_2p2c
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_2p2c_SOURCES = test_2p2c.cc
 
diff --git a/test/boxmodels/2p2cni/Makefile.am b/test/boxmodels/2p2cni/Makefile.am
index 5b3d1ff7e0afa7d4182c4a303e59c5015a5ca6f9..1f33e4651b0eaa08f044cd82c91f13109b3ed811 100644
--- a/test/boxmodels/2p2cni/Makefile.am
+++ b/test/boxmodels/2p2cni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_2p2cni
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_2p2cni_SOURCES = test_2p2cni.cc
 
diff --git a/test/boxmodels/2pni/Makefile.am b/test/boxmodels/2pni/Makefile.am
index 93340de4157762d083c2863b8b185305992c64b8..afd62a4c2f98a3bdb2e863d6cccefe3810a9e139 100644
--- a/test/boxmodels/2pni/Makefile.am
+++ b/test/boxmodels/2pni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_2pni
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_2pni_SOURCES = test_2pni.cc
 
diff --git a/test/boxmodels/3p3c/Makefile.am b/test/boxmodels/3p3c/Makefile.am
index 0377191dff7ba0883cb3de03cf24bbddaa60f3c7..2b2d3189d7e9df842c2671907861b3f13fe97c5b 100644
--- a/test/boxmodels/3p3c/Makefile.am
+++ b/test/boxmodels/3p3c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_3p3c
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_3p3c_SOURCES = test_3p3c.cc
 
diff --git a/test/boxmodels/3p3cni/Makefile.am b/test/boxmodels/3p3cni/Makefile.am
index bdf9f1d949861baa9ef5c7b25f5eb37b46346df0..e978ce391bccda69c3595a5e5d56a6bb815d0bfe 100644
--- a/test/boxmodels/3p3cni/Makefile.am
+++ b/test/boxmodels/3p3cni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_3p3cni
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_3p3cni_SOURCES = test_3p3cni.cc
 
diff --git a/test/boxmodels/mpnc/Makefile.am b/test/boxmodels/mpnc/Makefile.am
index f03fd838df20a35fffbdad0f5711121c4fb23572..0a0e02541d9495ab6ec428f9f56b85f877deb099 100644
--- a/test/boxmodels/mpnc/Makefile.am
+++ b/test/boxmodels/mpnc/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_mpnc
 noinst_HEADERS = *.hh
 
-EXTRA_DIST=CMakeLists.txt grids/*.dgf
+EXTRA_DIST=*.input CMakeLists.txt grids/*.dgf
 gridsdir=$(datadir)/dumux/grids
 grids_DATA=grids/*.dgf
 
diff --git a/test/boxmodels/richards/Makefile.am b/test/boxmodels/richards/Makefile.am
index d046aff51ed4e49bfc46f5aceb047e981bb64e8d..8782996784f0d8045ee38b627ed8fd4b58d37d49 100644
--- a/test/boxmodels/richards/Makefile.am
+++ b/test/boxmodels/richards/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_richards
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_richards_SOURCES = test_richards.cc 
 
diff --git a/test/decoupled/1p/Makefile.am b/test/decoupled/1p/Makefile.am
index 61827f8c6e306f1165eeb867a21e92858816c8c8..93cc2dd4a525b4276b893ef94293bd67888f528d 100644
--- a/test/decoupled/1p/Makefile.am
+++ b/test/decoupled/1p/Makefile.am
@@ -2,7 +2,7 @@
 check_PROGRAMS = test_diffusion test_1p
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 
 test_diffusion_SOURCES = test_diffusion.cc
 
diff --git a/test/decoupled/2p/Makefile.am b/test/decoupled/2p/Makefile.am
index 75a2ff86dbbf7ff4a39a4033b2e58ae47d0cc9df..e554f5c92e7f163305445a707fcbeabd97a7d8e3 100644
--- a/test/decoupled/2p/Makefile.am
+++ b/test/decoupled/2p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_impes test_transport
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_impes_SOURCES = test_impes.cc
 
diff --git a/test/decoupled/2p2c/Makefile.am b/test/decoupled/2p2c/Makefile.am
index 59ddc9bada3260c452c96d0de3376c6f95e8758d..aa2b09d2b4091e7e3f2d98a775f539eb4060a85d 100644
--- a/test/decoupled/2p2c/Makefile.am
+++ b/test/decoupled/2p2c/Makefile.am
@@ -7,5 +7,5 @@ test_dec2p2c_SOURCES = test_dec2p2c.cc
 
 test_multiphysics2p2c_SOURCES = test_multiphysics2p2c.cc
 
-EXTRA_DIST=CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 include $(top_srcdir)/am/global-rules
diff --git a/test/decoupled/2padaptive/Makefile.am b/test/decoupled/2padaptive/Makefile.am
index 378f6cc5eb16cfad8d539e45cea1fca864d9d296..db11ba982623485303d217bbcae82641126ab097 100644
--- a/test/decoupled/2padaptive/Makefile.am
+++ b/test/decoupled/2padaptive/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_impesadaptive
 
 noinst_HEADERS = *.hh
-EXTRA_DIST = grids/*.dgf CMakeLists.txt
+EXTRA_DIST=*.input grids/*.dgf CMakeLists.txt
 
 test_impesadaptive_SOURCES = test_impesadaptive.cc
 
diff --git a/test/freeflow/stokes/Makefile.am b/test/freeflow/stokes/Makefile.am
index c61fb42d1c43afc476b3b46e9b9a3d4b485e29af..ca491cf8de3836f3a945b7a181e6a3481d48ed1e 100644
--- a/test/freeflow/stokes/Makefile.am
+++ b/test/freeflow/stokes/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes
 
 test_stokes_SOURCES = test_stokes.cc
 
-EXTRA_DIST=CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 noinst_HEADERS=*.hh
 include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2c/Makefile.am b/test/freeflow/stokes2c/Makefile.am
index 3c6ffc0a96f7bc573d038339a291e68e6f0155b7..f789449f91a081538f2fb471c63965bdafc86331 100644
--- a/test/freeflow/stokes2c/Makefile.am
+++ b/test/freeflow/stokes2c/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes2c
 
 test_stokes2c_SOURCES = test_stokes2c.cc
 
-EXTRA_DIST=CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 noinst_HEADERS=*.hh
 include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2cni/Makefile.am b/test/freeflow/stokes2cni/Makefile.am
index 498bbc18e46a65ccbe5230be6f233eb1186b92e3..f680e355647475367f1cccb3426e6810acc07f86 100644
--- a/test/freeflow/stokes2cni/Makefile.am
+++ b/test/freeflow/stokes2cni/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_stokes2cni
 
 test_stokes2cni_SOURCES = test_stokes2cni.cc
 
-EXTRA_DIST=CMakeLists.txt
+EXTRA_DIST=*.input CMakeLists.txt
 noinst_HEADERS=*.hh
 include $(top_srcdir)/am/global-rules