diff --git a/test/decoupled/1p/Makefile.am b/test/decoupled/1p/Makefile.am
index 50205282195ecaa428d03d12f0862288f006ea40..d2c80c3d9fd66d92d23d7a0cfee21a2f5ec50d2d 100644
--- a/test/decoupled/1p/Makefile.am
+++ b/test/decoupled/1p/Makefile.am
@@ -2,7 +2,7 @@
 check_PROGRAMS = test_diffusion test_diffusion3d test_1p
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_diffusion_SOURCES = test_diffusion.cc
 
diff --git a/test/decoupled/2p/Makefile.am b/test/decoupled/2p/Makefile.am
index daae274ae01365d8be7cb775313fb9a751c8067a..033853ac0216f841a59e9d85f94661e534ce1f15 100644
--- a/test/decoupled/2p/Makefile.am
+++ b/test/decoupled/2p/Makefile.am
@@ -6,7 +6,7 @@ check_PROGRAMS = test_impes \
                  test_3d2p
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_impes_SOURCES = test_impes.cc
 
diff --git a/test/freeflow/navierstokes/Makefile.am b/test/freeflow/navierstokes/Makefile.am
index 8c4b25ab92de3ae18a6fd81087eb32bfd1e04312..93b567cc33b62c5206e8a7a7f9c46ba940748040 100644
--- a/test/freeflow/navierstokes/Makefile.am
+++ b/test/freeflow/navierstokes/Makefile.am
@@ -2,6 +2,6 @@ check_PROGRAMS = test_navierstokes
 
 test_navierstokes_SOURCES = test_navierstokes.cc
 
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 noinst_HEADERS:=$(wildcard *.hh)
 include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes/Makefile.am b/test/freeflow/stokes/Makefile.am
index 647fb2fdd5c502e29cf1f718da21c9dcec679244..24ee5688b11d22bc5e15892a2d96144dcc100cac 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:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 noinst_HEADERS:=$(wildcard *.hh)
 include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2c/Makefile.am b/test/freeflow/stokes2c/Makefile.am
index 7c0fc68fa934e535c58da2f4b35165730ffead40..752547a3160f7e5f646f467bcb9ba593165ecdb5 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:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 noinst_HEADERS:=$(wildcard *.hh)
 include $(top_srcdir)/am/global-rules
diff --git a/test/freeflow/stokes2cni/Makefile.am b/test/freeflow/stokes2cni/Makefile.am
index 59edff211709371380c0323e8072adcd547d4311..b557ae02d1151c0061d8135ed5c6127071b1cbdb 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:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 noinst_HEADERS:=$(wildcard *.hh)
 include $(top_srcdir)/am/global-rules
diff --git a/test/geomechanics/el1p2c/Makefile.am b/test/geomechanics/el1p2c/Makefile.am
index d9894537683084a2acafe2541217ead80aaa6654..168a9d887d7e5f35eb17a004a0d069ac07a8716d 100644
--- a/test/geomechanics/el1p2c/Makefile.am
+++ b/test/geomechanics/el1p2c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_el1p2c
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_el1p2c_SOURCES = test_el1p2c.cc
 
diff --git a/test/geomechanics/el2p/Makefile.am b/test/geomechanics/el2p/Makefile.am
index 04f70f8592c3a1da2cc4e68bf19d0cef878493b1..94e64a2607f13acc5698b991edd69a290c8e7539 100644
--- a/test/geomechanics/el2p/Makefile.am
+++ b/test/geomechanics/el2p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_el2p
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST= grids/$(wildcard *.dgf) co2values.inc CMakeLists.txt
+EXTRA_DIST:=$(wildcard grids/*.dgf) co2values.inc CMakeLists.txt
 
 test_el2p_SOURCES = test_el2p.cc
 
diff --git a/test/geomechanics/elastic/Makefile.am b/test/geomechanics/elastic/Makefile.am
index ca86e26716bc395a9ceffeafd7897a0b6d77118f..f2ec7dfc941cb135387309fba583d090a6c280b6 100644
--- a/test/geomechanics/elastic/Makefile.am
+++ b/test/geomechanics/elastic/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_elastic
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_elastic_SOURCES = test_elastic.cc
 
diff --git a/test/implicit/1p/Makefile.am b/test/implicit/1p/Makefile.am
index e0ebbbea4348f5dc3e1de0f401408bb2cc87b2d7..044ff10b7fa68777af698f8d84a5f8e147405cf4 100644
--- a/test/implicit/1p/Makefile.am
+++ b/test/implicit/1p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box1p test_cc1p test_box1pwithamg test_cc1pwithamg
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box1p_SOURCES = test_box1p.cc
 test_cc1p_SOURCES = test_cc1p.cc
diff --git a/test/implicit/1p2c/Makefile.am b/test/implicit/1p2c/Makefile.am
index 6677ec94714c33a4900efebfd524a8e918ce5cbd..346738d42c85ff75ff5617f4251c894a5c4138db 100644
--- a/test/implicit/1p2c/Makefile.am
+++ b/test/implicit/1p2c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box1p2c test_cc1p2c
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box1p2c_SOURCES = test_box1p2c.cc
 test_cc1p2c_SOURCES = test_cc1p2c.cc
diff --git a/test/implicit/2p/Makefile.am b/test/implicit/2p/Makefile.am
index 226d72707ac5fb4c12cbafdd3120ad6763d1a859..19c9cc27e4a216765f5fb1d3777ae5c3315b795b 100644
--- a/test/implicit/2p/Makefile.am
+++ b/test/implicit/2p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box2p test_cc2p
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box2p_SOURCES = test_box2p.cc
 test_cc2p_SOURCES = test_cc2p.cc
diff --git a/test/implicit/2p2c/Makefile.am b/test/implicit/2p2c/Makefile.am
index eb969643d285f36c7fd43a1ec77e62baa052b834..ca584b506c2b55f01ed03180f969a318953a6364 100644
--- a/test/implicit/2p2c/Makefile.am
+++ b/test/implicit/2p2c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box2p2c test_cc2p2c
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box2p2c_SOURCES = test_box2p2c.cc
 test_cc2p2c_SOURCES = test_cc2p2c.cc
diff --git a/test/implicit/2p2cni/Makefile.am b/test/implicit/2p2cni/Makefile.am
index 9d151957e6925ec683d92347335414eb37079116..0ab73e55ea7f93f4ec3911cff9fd0acfbdbeabba 100644
--- a/test/implicit/2p2cni/Makefile.am
+++ b/test/implicit/2p2cni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box2p2cni test_cc2p2cni
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box2p2cni_SOURCES = test_box2p2cni.cc
 test_cc2p2cni_SOURCES = test_cc2p2cni.cc
diff --git a/test/implicit/2pni/Makefile.am b/test/implicit/2pni/Makefile.am
index 1669644787097b96a2b3b36d27f1ff4d95e00b9a..3660056a81406fc25fc9bec35d2b7bdf44464ecf 100644
--- a/test/implicit/2pni/Makefile.am
+++ b/test/implicit/2pni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box2pni test_cc2pni
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box2pni_SOURCES = test_box2pni.cc
 test_cc2pni_SOURCES = test_cc2pni.cc
diff --git a/test/implicit/3p/Makefile.am b/test/implicit/3p/Makefile.am
index 03a838e965827972f0a94e5c583484880b6451c8..3f26d054f6fa76045789360c471ac6286eb02e44 100644
--- a/test/implicit/3p/Makefile.am
+++ b/test/implicit/3p/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box3p test_cc3p
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box3p_SOURCES = test_box3p.cc
 test_cc3p_SOURCES = test_cc3p.cc
diff --git a/test/implicit/3p3c/Makefile.am b/test/implicit/3p3c/Makefile.am
index 3a6ac245efc438e1359a9f5efd19d6a0dc4e1d4a..455b21045af1b0ed23fe088c83f0fd11a29341e7 100644
--- a/test/implicit/3p3c/Makefile.am
+++ b/test/implicit/3p3c/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box3p3c test_cc3p3c
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box3p3c_SOURCES = test_box3p3c.cc
 test_cc3p3c_SOURCES = test_cc3p3c.cc
diff --git a/test/implicit/3p3cni/Makefile.am b/test/implicit/3p3cni/Makefile.am
index 6dd60230190308e261798a1052ec72595f997280..df2e253406eb1a3034d7a08e8e0f861c0a239470 100644
--- a/test/implicit/3p3cni/Makefile.am
+++ b/test/implicit/3p3cni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_box3p3cni test_cc3p3cni
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_box3p3cni_SOURCES = test_box3p3cni.cc
 test_cc3p3cni_SOURCES = test_cc3p3cni.cc
diff --git a/test/implicit/co2/Makefile.am b/test/implicit/co2/Makefile.am
index 55bae0c9d4ef26830ac4dc0f743cfa69536aebb2..5139aa37883af73f2b2dd3749664b08e97e5b9c9 100644
--- a/test/implicit/co2/Makefile.am
+++ b/test/implicit/co2/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_boxco2 test_ccco2
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
+EXTRA_DIST = CMakeLists.txt $(wildcard *.input) $(wildcard grids/*.dgf) co2values.inc
 
 test_boxco2_SOURCES = test_boxco2.cc
 test_ccco2_SOURCES = test_ccco2.cc
diff --git a/test/implicit/co2ni/Makefile.am b/test/implicit/co2ni/Makefile.am
index 220004fbba351eb97e03b0dbf4932e95cabff428..6de1d18973ef6213e3699116fdbd0264cb9fdc84 100644
--- a/test/implicit/co2ni/Makefile.am
+++ b/test/implicit/co2ni/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_boxco2ni test_ccco2ni
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST = CMakeLists.txt $(wildcard *.input) grids/$(wildcard *.dgf) co2values.inc
+EXTRA_DIST = CMakeLists.txt $(wildcard *.input) $(wildcard grids/*.dgf) co2values.inc
 
 test_boxco2ni_SOURCES = test_boxco2ni.cc
 test_ccco2ni_SOURCES = test_ccco2ni.cc
diff --git a/test/implicit/mpnc/Makefile.am b/test/implicit/mpnc/Makefile.am
index e4bb25b035acda068333644fca368970a62facc7..59aa84ba03b8170ab498e80088d5fe37d9e1cfc1 100644
--- a/test/implicit/mpnc/Makefile.am
+++ b/test/implicit/mpnc/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_boxmpnc test_ccmpnc test_forchheimer2p test_forchheimer1p test_boxmpnckinetic test_boxmpncthermalnonequil
 noinst_HEADERS := $(wildcard *.hh)
 
-EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt grids/$(wildcard *.dgf)
+EXTRA_DIST:= $(wildcard *.input) CMakeLists.txt $(wildcard grids/*.dgf)
 gridsdir=$(datadir)/dumux/grids
 grids_DATA=grids/$(wildcard *.dgf)
 
diff --git a/test/implicit/richards/Makefile.am b/test/implicit/richards/Makefile.am
index 0055894ea1ef85e93ad7119781e26b27855412aa..20e21e07a2c83a7db4a1ad7a73f4f9a57f7b7cd6 100644
--- a/test/implicit/richards/Makefile.am
+++ b/test/implicit/richards/Makefile.am
@@ -1,7 +1,7 @@
 check_PROGRAMS = test_boxrichards test_ccrichards
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST:=$(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST:=$(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_boxrichards_SOURCES = test_boxrichards.cc 
 test_ccrichards_SOURCES = test_ccrichards.cc 
diff --git a/test/multidomain/2cnistokes2p2cni/Makefile.am b/test/multidomain/2cnistokes2p2cni/Makefile.am
index 479381d0388f1fdaf8fd673f80af10e8ba50010a..4d0ffa3efdc74f617cf26f13d75af097347d68f8 100644
--- a/test/multidomain/2cnistokes2p2cni/Makefile.am
+++ b/test/multidomain/2cnistokes2p2cni/Makefile.am
@@ -9,7 +9,7 @@ headercheck_IGNORE = \
 endif
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST := $(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_2cnistokes2p2cni_SOURCES = test_2cnistokes2p2cni.cc
 
diff --git a/test/multidomain/2cstokes2p2c/Makefile.am b/test/multidomain/2cstokes2p2c/Makefile.am
index 4d15b0e3b13f1fe9e5c31e46efe20a5ad340de10..24e3774bcf7ffa02fc708bdfd709cd926a623557 100644
--- a/test/multidomain/2cstokes2p2c/Makefile.am
+++ b/test/multidomain/2cstokes2p2c/Makefile.am
@@ -9,7 +9,7 @@ headercheck_IGNORE = \
 endif
 
 noinst_HEADERS := $(wildcard *.hh)
-EXTRA_DIST := $(wildcard *.input) grids/$(wildcard *.dgf) CMakeLists.txt
+EXTRA_DIST := $(wildcard *.input) $(wildcard grids/*.dgf) CMakeLists.txt
 
 test_2cstokes2p2c_SOURCES = test_2cstokes2p2c.cc