diff --git a/regression_test/compileonly/mfgen-xsd/Makefile b/regression_test/compileonly/mfgen-xsd/Makefile
index 1e4eff2705cb194a63c11dbfff785835c6aa796d..c1909076862cfd8607a41737f8d89d598a48f78b 100644
--- a/regression_test/compileonly/mfgen-xsd/Makefile
+++ b/regression_test/compileonly/mfgen-xsd/Makefile
@@ -97,7 +97,7 @@ normal:
 centralstorage:
 	#Centralstorage tests with various switches
 	#First build normal
-	cd normal && $(MFGEN) $(MFGEN_FLAGS) -l $(NORMAL_FILES) && $(MAKEPROG)
+	cd normal && $(MFGEN) $(MFGEN_FLAGS) $(NORMAL_FILES) && $(MAKEPROG)
 
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -c $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
@@ -111,6 +111,8 @@ centralstorage:
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean
 
+	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -l $(NORMAL_FILES) && $(MAKEPROG)
+
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -cl $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean \
@@ -123,23 +125,29 @@ centralstorage:
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean
 
+	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -l $(NORMAL_FILES) && $(MAKEPROG)
+
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -cpgl $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean \
 	&& make shared_objects && make clean
 
 	# For the tests with -U type the 'base' should be compiled with -U type
-	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -U type -l $(NORMAL_FILES) && $(MAKEPROG)
+	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -U type $(NORMAL_FILES) && $(MAKEPROG)
 
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -c -U type $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean
 
+	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -U type -l $(NORMAL_FILES) && $(MAKEPROG)
+
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -cpl -U type $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean \
 	&& make shared_objects && make clean
 
+	cd normal && make clean && $(MFGEN) $(MFGEN_FLAGS) -U type -l $(NORMAL_FILES) && $(MAKEPROG)
+
 	cd centralstorage && $(MFGEN) $(MFGEN_FLAGS) -cpgl -U type $(EXT_FILES) $(EXT_NORMAL_FILES) \
 	&& $(MAKEPROG) && ./MainExt config.cfg \
 	&& make clean && make port && make check && make clean \