diff --git a/test/freeflow/shallowwater/CMakeLists.txt b/test/freeflow/shallowwater/CMakeLists.txt
index c86e8431aeea3ef54146e9185419a43df4969f5a..a176539f0f14c88d71b8f5f2d6cd5b37dca369d0 100644
--- a/test/freeflow/shallowwater/CMakeLists.txt
+++ b/test/freeflow/shallowwater/CMakeLists.txt
@@ -1,6 +1 @@
-dune_symlink_to_source_files(FILES "params.input" references)
-
-dune_add_test(NAME test_shallowwater
-              SOURCES main.cc
-              COMPILE_DEFINITIONS TYPETAG=DamBreakWet
-              COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_shallowwater)
+add_subdirectory(dambreak)
diff --git a/test/freeflow/shallowwater/dambreak/CMakeLists.txt b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c86e8431aeea3ef54146e9185419a43df4969f5a
--- /dev/null
+++ b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
@@ -0,0 +1,6 @@
+dune_symlink_to_source_files(FILES "params.input" references)
+
+dune_add_test(NAME test_shallowwater
+              SOURCES main.cc
+              COMPILE_DEFINITIONS TYPETAG=DamBreakWet
+              COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test_shallowwater)
diff --git a/test/freeflow/shallowwater/main.cc b/test/freeflow/shallowwater/dambreak/main.cc
similarity index 100%
rename from test/freeflow/shallowwater/main.cc
rename to test/freeflow/shallowwater/dambreak/main.cc
diff --git a/test/freeflow/shallowwater/params.input b/test/freeflow/shallowwater/dambreak/params.input
similarity index 100%
rename from test/freeflow/shallowwater/params.input
rename to test/freeflow/shallowwater/dambreak/params.input
diff --git a/test/freeflow/shallowwater/problem.hh b/test/freeflow/shallowwater/dambreak/problem.hh
similarity index 100%
rename from test/freeflow/shallowwater/problem.hh
rename to test/freeflow/shallowwater/dambreak/problem.hh
diff --git a/test/freeflow/shallowwater/references/solution.csv b/test/freeflow/shallowwater/dambreak/references/solution.csv
similarity index 100%
rename from test/freeflow/shallowwater/references/solution.csv
rename to test/freeflow/shallowwater/dambreak/references/solution.csv
diff --git a/test/freeflow/shallowwater/spatialparams.hh b/test/freeflow/shallowwater/dambreak/spatialparams.hh
similarity index 100%
rename from test/freeflow/shallowwater/spatialparams.hh
rename to test/freeflow/shallowwater/dambreak/spatialparams.hh