diff --git a/test_communication/CMakeLists.txt b/test_communication/CMakeLists.txt
index 191e7da0..09d0e756 100644
--- a/test_communication/CMakeLists.txt
+++ b/test_communication/CMakeLists.txt
@@ -49,15 +49,10 @@ if(BUILD_TESTING)
     # Decide category based on interface_ns
     if(interface_ns STREQUAL "msg")
       list(APPEND message_files "${interface_file}")
-      continue()
-    endif()
-    if(interface_ns STREQUAL "srv")
+    elseif(interface_ns STREQUAL "srv")
       list(APPEND service_files "${interface_file}")
-      continue()
-    endif()
-    if(interface_ns STREQUAL "action")
+    elseif(interface_ns STREQUAL "action")
       list(APPEND action_files "${interface_file}")
-      continue()
     endif()
   endforeach()