diff --git a/valohai_cli/commands/execution/run.py b/valohai_cli/commands/execution/run.py
index 643cc5c..9b85f99 100644
--- a/valohai_cli/commands/execution/run.py
+++ b/valohai_cli/commands/execution/run.py
@@ -71,6 +71,7 @@ class RunCommand(click.Command):
         super(RunCommand, self).__init__(
             name=sanitize_name(step.name.lower()),
             callback=self.execute,
+            epilog='Multiple files per input: --my-input=myurl --my-input=myotherurl',
             add_help_option=True,
         )
         for parameter in step.parameters.values():
@@ -107,8 +108,9 @@ class RunCommand(click.Command):
         option = click.Option(
             param_decls=list(generate_sanitized_options(input.name)),
             required=(input.default is None and not input.optional),
-            default=input.default,
+            default=([input.default] if input.default else []),
             metavar='URL',
+            multiple=True,
             help='Input "%s"' % humanize_identifier(input.name),
         )
         option.name = '^%s' % input.name  # Caretize so we can pick these out of kwargs easily

diff --git a/tests/commands/execution/test_run.py b/tests/commands/execution/test_run.py
index fc78001..7e42a90 100644
--- a/tests/commands/execution/test_run.py
+++ b/tests/commands/execution/test_run.py
@@ -83,7 +83,8 @@ def test_run(runner, logged_in_and_linked, monkeypatch, pass_param, pass_input,
 
     if pass_input:
         args.append('--in1=http://url')
-        values['inputs'] = {'in1': 'http://url'}
+        args.append('--in1=http://anotherurl')
+        values['inputs'] = {'in1': ['http://url', 'http://anotherurl']}
 
     if pass_env:
         args.append('--environment=015dbd56-2670-b03e-f37c-dc342714f1b5')

Support multiple files per input
Support for this seems to be lacking in the CLI, even if the web UI and API support it.
tests/commands/execution/test_run.py::test_run[adhoc-False-True-False] tests/commands/execution/test_run.py::test_run[adhoc-False-True-True] tests/commands/execution/test_run.py::test_run[regular-True-True-True] tests/commands/execution/test_run.py::test_run[adhoc-True-True-True] tests/commands/execution/test_run.py::test_run[regular-False-True-False] tests/commands/execution/test_run.py::test_run[regular-True-True-False] tests/commands/execution/test_run.py::test_run[regular-False-True-True] tests/commands/execution/test_run.py::test_run[adhoc-True-True-False]
tests/commands/execution/test_run.py::test_run[regular-False-False-False] tests/commands/execution/test_run.py::test_run[regular-True-False-False] tests/commands/execution/test_run.py::test_run[regular-False-False-True] tests/commands/execution/test_run.py::test_param_input_sanitization tests/commands/execution/test_run.py::test_run[adhoc-False-False-True] tests/commands/execution/test_run.py::test_run_requires_step tests/commands/execution/test_run.py::test_run[regular-True-False-True] tests/commands/execution/test_run.py::test_run[adhoc-True-False-False] tests/commands/execution/test_run.py::test_typo_check tests/commands/execution/test_run.py::test_run[adhoc-False-False-False] tests/commands/execution/test_run.py::test_run[adhoc-True-False-True] tests/commands/execution/test_run.py::test_run_no_git