diff --git a/exercises/solution/exercise-fluidsystem/CMakeLists.txt b/exercises/solution/exercise-fluidsystem/CMakeLists.txt
index ff2ff0583be172aa0241158f59d912ecf56a6cc8..caccfb65baafc120fa7d628146be2de715749afa 100644
--- a/exercises/solution/exercise-fluidsystem/CMakeLists.txt
+++ b/exercises/solution/exercise-fluidsystem/CMakeLists.txt
@@ -3,13 +3,13 @@
 dune_add_test(NAME exercise-fluidsystem_a_solution
               SOURCES exercise-fluidsystem.cc
               COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTypeTag
-              CMD_ARGS exercise-fluidsystem_a.input)
+              CMD_ARGS exercise-fluidsystem_a_solution.input)
 
 #part b: 2p2cproblem
 dune_add_test(NAME exercise-fluidsystem_b_solution
               SOURCES exercise-fluidsystem.cc
               COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoCTypeTag
-              CMD_ARGS exercise-fluidsystem_b.input)
+              CMD_ARGS exercise-fluidsystem_b_solution.input)
 
 # add exercises to the common target
 add_dependencies(test_exercises exercise-fluidsystem_a exercise-fluidsystem_b)
diff --git a/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a.input b/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a_solution.input
similarity index 100%
rename from exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a.input
rename to exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a_solution.input
diff --git a/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b.input b/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b_solution.input
similarity index 100%
rename from exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b.input
rename to exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b_solution.input