diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt
index cf614128a3dfe814162be55ec79acb339d8b7407..d44d1ffbd14b3dce21af25022780220f98d413bc 100644
--- a/test/geomechanics/elastic/CMakeLists.txt
+++ b/test/geomechanics/elastic/CMakeLists.txt
@@ -1,18 +1,18 @@
-dune_symlink_to_source_files(FILES "elastic.input")
+dune_symlink_to_source_files(FILES "params.input")
 
 # using box
 dune_add_test(NAME test_elastic_box
-              SOURCES test_elastic.cc
+              SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/elasticbox-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/elastic-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_elastic_box elastic.input")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_elastic_box-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_elastic_box-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_elastic_box params.input -Problem.Name test_elastic_box")
 
 set(CMAKE_BUILD_TYPE Release)
 
 install(FILES
 problem.hh
 spatialparams.hh
-test_elastic.cc
+main.cc
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/test/geomechanics/elastic)
diff --git a/test/geomechanics/elastic/test_elastic.cc b/test/geomechanics/elastic/main.cc
similarity index 100%
rename from test/geomechanics/elastic/test_elastic.cc
rename to test/geomechanics/elastic/main.cc
diff --git a/test/geomechanics/elastic/elastic.input b/test/geomechanics/elastic/params.input
similarity index 100%
rename from test/geomechanics/elastic/elastic.input
rename to test/geomechanics/elastic/params.input
diff --git a/test/geomechanics/poroelastic/CMakeLists.txt b/test/geomechanics/poroelastic/CMakeLists.txt
index df2361d674570994babf7112af72bb96c9dbddfd..fed0f596160b5f4083228fbcea12eddbab800d2b 100644
--- a/test/geomechanics/poroelastic/CMakeLists.txt
+++ b/test/geomechanics/poroelastic/CMakeLists.txt
@@ -1,18 +1,18 @@
-dune_symlink_to_source_files(FILES "poroelastic.input")
+dune_symlink_to_source_files(FILES "params.input")
 
 # using box and numeric differentiation
 dune_add_test(NAME test_poroelastic_box
-              SOURCES test_poroelastic.cc
+              SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/poroelasticbox-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/poroelastic-00001.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_poroelastic_box poroelastic.input")
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_poroelastic_box-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_poroelastic_box-00001.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_poroelastic_box params.input -Problem.Name test_poroelastic_box")
 
 set(CMAKE_BUILD_TYPE Release)
 
 install(FILES
 problem.hh
 spatialparams.hh
-test_poroelastic.cc
+main.cc
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/test/geomechanics/poroelastic)
diff --git a/test/geomechanics/poroelastic/test_poroelastic.cc b/test/geomechanics/poroelastic/main.cc
similarity index 100%
rename from test/geomechanics/poroelastic/test_poroelastic.cc
rename to test/geomechanics/poroelastic/main.cc
diff --git a/test/geomechanics/poroelastic/poroelastic.input b/test/geomechanics/poroelastic/params.input
similarity index 100%
rename from test/geomechanics/poroelastic/poroelastic.input
rename to test/geomechanics/poroelastic/params.input
diff --git a/test/references/elasticbox-reference.vtu b/test/references/test_elastic_box-reference.vtu
similarity index 100%
rename from test/references/elasticbox-reference.vtu
rename to test/references/test_elastic_box-reference.vtu
diff --git a/test/references/poroelasticbox-reference.vtu b/test/references/test_poroelastic_box-reference.vtu
similarity index 100%
rename from test/references/poroelasticbox-reference.vtu
rename to test/references/test_poroelastic_box-reference.vtu