diff --git a/CMakeLists.txt b/CMakeLists.txt
index e71e30940..faf400f1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -580,7 +580,7 @@ foreach(OBJ ${COMMON_MODELS} ${FLOW_MODELS} ${FLOW_VARIANT_MODELS})
   opm_add_test(flow_${OBJ}
                ONLY_COMPILE
                SOURCES
-               flow/flow_${OBJ}.cpp
+               flow/flow_${OBJ}_main.cpp
                $<TARGET_OBJECTS:moduleVersion>
                $<TARGET_OBJECTS:flow_lib${OBJ}>
                EXE_NAME flow_${OBJ}
diff --git a/flow/flow_blackoil_legacyassembly.cpp b/flow/flow_blackoil_legacyassembly_main.cpp
similarity index 100%
rename from flow/flow_blackoil_legacyassembly.cpp
rename to flow/flow_blackoil_legacyassembly_main.cpp
diff --git a/flow/flow_blackoil.cpp b/flow/flow_blackoil_main.cpp
similarity index 100%
rename from flow/flow_blackoil.cpp
rename to flow/flow_blackoil_main.cpp
diff --git a/flow/flow_brine_energy.cpp b/flow/flow_brine_energy_main.cpp
similarity index 100%
rename from flow/flow_brine_energy.cpp
rename to flow/flow_brine_energy_main.cpp
diff --git a/flow/flow_brine.cpp b/flow/flow_brine_main.cpp
similarity index 100%
rename from flow/flow_brine.cpp
rename to flow/flow_brine_main.cpp
diff --git a/flow/flow_brine_precsalt_vapwat.cpp b/flow/flow_brine_precsalt_vapwat_main.cpp
similarity index 100%
rename from flow/flow_brine_precsalt_vapwat.cpp
rename to flow/flow_brine_precsalt_vapwat_main.cpp
diff --git a/flow/flow_brine_saltprecipitation.cpp b/flow/flow_brine_saltprecipitation_main.cpp
similarity index 100%
rename from flow/flow_brine_saltprecipitation.cpp
rename to flow/flow_brine_saltprecipitation_main.cpp
diff --git a/flow/flow_energy.cpp b/flow/flow_energy_main.cpp
similarity index 100%
rename from flow/flow_energy.cpp
rename to flow/flow_energy_main.cpp
diff --git a/flow/flow_extbo.cpp b/flow/flow_extbo_main.cpp
similarity index 100%
rename from flow/flow_extbo.cpp
rename to flow/flow_extbo_main.cpp
diff --git a/flow/flow_foam.cpp b/flow/flow_foam_main.cpp
similarity index 100%
rename from flow/flow_foam.cpp
rename to flow/flow_foam_main.cpp
diff --git a/flow/flow_gasoil_energy.cpp b/flow/flow_gasoil_energy_main.cpp
similarity index 100%
rename from flow/flow_gasoil_energy.cpp
rename to flow/flow_gasoil_energy_main.cpp
diff --git a/flow/flow_gasoil.cpp b/flow/flow_gasoil_main.cpp
similarity index 100%
rename from flow/flow_gasoil.cpp
rename to flow/flow_gasoil_main.cpp
diff --git a/flow/flow_gasoildiffuse.cpp b/flow/flow_gasoildiffuse_main.cpp
similarity index 100%
rename from flow/flow_gasoildiffuse.cpp
rename to flow/flow_gasoildiffuse_main.cpp
diff --git a/flow/flow_gaswater_brine.cpp b/flow/flow_gaswater_brine_main.cpp
similarity index 100%
rename from flow/flow_gaswater_brine.cpp
rename to flow/flow_gaswater_brine_main.cpp
diff --git a/flow/flow_gaswater_dissolution_diffuse.cpp b/flow/flow_gaswater_dissolution_diffuse_main.cpp
similarity index 100%
rename from flow/flow_gaswater_dissolution_diffuse.cpp
rename to flow/flow_gaswater_dissolution_diffuse_main.cpp
diff --git a/flow/flow_gaswater_dissolution.cpp b/flow/flow_gaswater_dissolution_main.cpp
similarity index 100%
rename from flow/flow_gaswater_dissolution.cpp
rename to flow/flow_gaswater_dissolution_main.cpp
diff --git a/flow/flow_gaswater_energy.cpp b/flow/flow_gaswater_energy_main.cpp
similarity index 100%
rename from flow/flow_gaswater_energy.cpp
rename to flow/flow_gaswater_energy_main.cpp
diff --git a/flow/flow_gaswater.cpp b/flow/flow_gaswater_main.cpp
similarity index 100%
rename from flow/flow_gaswater.cpp
rename to flow/flow_gaswater_main.cpp
diff --git a/flow/flow_gaswater_saltprec_energy.cpp b/flow/flow_gaswater_saltprec_energy_main.cpp
similarity index 100%
rename from flow/flow_gaswater_saltprec_energy.cpp
rename to flow/flow_gaswater_saltprec_energy_main.cpp
diff --git a/flow/flow_gaswater_saltprec_vapwat.cpp b/flow/flow_gaswater_saltprec_vapwat_main.cpp
similarity index 100%
rename from flow/flow_gaswater_saltprec_vapwat.cpp
rename to flow/flow_gaswater_saltprec_vapwat_main.cpp
diff --git a/flow/flow_gaswater_solvent.cpp b/flow/flow_gaswater_solvent_main.cpp
similarity index 100%
rename from flow/flow_gaswater_solvent.cpp
rename to flow/flow_gaswater_solvent_main.cpp
diff --git a/flow/flow_micp.cpp b/flow/flow_micp_main.cpp
similarity index 100%
rename from flow/flow_micp.cpp
rename to flow/flow_micp_main.cpp
diff --git a/flow/flow_oilwater_brine.cpp b/flow/flow_oilwater_brine_main.cpp
similarity index 100%
rename from flow/flow_oilwater_brine.cpp
rename to flow/flow_oilwater_brine_main.cpp
diff --git a/flow/flow_oilwater.cpp b/flow/flow_oilwater_main.cpp
similarity index 100%
rename from flow/flow_oilwater.cpp
rename to flow/flow_oilwater_main.cpp
diff --git a/flow/flow_oilwater_polymer_injectivity.cpp b/flow/flow_oilwater_polymer_injectivity_main.cpp
similarity index 100%
rename from flow/flow_oilwater_polymer_injectivity.cpp
rename to flow/flow_oilwater_polymer_injectivity_main.cpp
diff --git a/flow/flow_oilwater_polymer.cpp b/flow/flow_oilwater_polymer_main.cpp
similarity index 100%
rename from flow/flow_oilwater_polymer.cpp
rename to flow/flow_oilwater_polymer_main.cpp
diff --git a/flow/flow_onephase_energy.cpp b/flow/flow_onephase_energy_main.cpp
similarity index 100%
rename from flow/flow_onephase_energy.cpp
rename to flow/flow_onephase_energy_main.cpp
diff --git a/flow/flow_onephase.cpp b/flow/flow_onephase_main.cpp
similarity index 100%
rename from flow/flow_onephase.cpp
rename to flow/flow_onephase_main.cpp
diff --git a/flow/flow_polymer.cpp b/flow/flow_polymer_main.cpp
similarity index 100%
rename from flow/flow_polymer.cpp
rename to flow/flow_polymer_main.cpp
diff --git a/flow/flow_solvent_foam.cpp b/flow/flow_solvent_foam_main.cpp
similarity index 100%
rename from flow/flow_solvent_foam.cpp
rename to flow/flow_solvent_foam_main.cpp
diff --git a/flow/flow_solvent.cpp b/flow/flow_solvent_main.cpp
similarity index 100%
rename from flow/flow_solvent.cpp
rename to flow/flow_solvent_main.cpp