diff --git a/scripts/roslaunch_test_generator.sh b/scripts/roslaunch_test_generator.sh
index d3771a36361d8f654238f874b715f30cc8fad5f3..8d8f8f14a34e65c2cd941d3e4e3ed500a9899371 100644
--- a/scripts/roslaunch_test_generator.sh
+++ b/scripts/roslaunch_test_generator.sh
@@ -16,11 +16,21 @@ if(CATKIN_ENABLE_TESTING)
 find_package(catkin REQUIRED COMPONENTS
 roslaunch
 )
-roslaunch_add_file_check(
-$(find . -type f -name "*.launch")
-)
+EOT
+
+## The roslaunch_add_file_check macro supports as parameter either a folder or a single launchfile
+## Here we call the macro for each of the launchfiles in the package
+  for launchfile in $(find . -type f -name "*.launch") ; do
+cat <<EOT >> CMakeLists.txt
+roslaunch_add_file_check(${launchfile})
+EOT
+  done
+
+## Close if(CATKIN_ENABLE_TESTING)
+cat <<EOT >> CMakeLists.txt
 endif()
 EOT
+
     fi
   fi
 done