diff --git a/moto/cloudformation/parsing.py b/moto/cloudformation/parsing.py
index fbf34b6f..dafe3043 100644
--- a/moto/cloudformation/parsing.py
+++ b/moto/cloudformation/parsing.py
@@ -345,7 +345,8 @@ class ResourceMap(collections.Mapping):
         # Set any input parameters that were passed
         for key, value in self.input_parameters.items():
             if key in self.resolved_parameters:
-                if parameter_slots[key].get('Type', 'String') == 'CommaDelimitedList':
+                value_type = parameter_slots[key].get('Type', 'String')
+                if value_type == 'CommaDelimitedList' or value_type.startswith("List"):
                     value = value.split(',')
                 self.resolved_parameters[key] = value