diff --git a/platformio/commands/ci.py b/platformio/commands/ci.py
index c7da3943..038943c3 100644
--- a/platformio/commands/ci.py
+++ b/platformio/commands/ci.py
@@ -52,7 +52,8 @@ def validate_path(ctx, param, value):  # pylint: disable=W0613
 
 @click.command("ci", short_help="Continuous Integration")
 @click.argument("src", nargs=-1, callback=validate_path)
-@click.option("-l", "--lib", multiple=True, callback=validate_path)
+@click.option(
+    "-l", "--lib", multiple=True, callback=validate_path, metavar="DIRECTORY")
 @click.option("--exclude", multiple=True)
 @click.option(
     "-b", "--board", multiple=True, metavar="ID", callback=validate_boards)
diff --git a/tests/commands/test_ci.py b/tests/commands/test_ci.py
new file mode 100644
index 00000000..290c9720
--- /dev/null
+++ b/tests/commands/test_ci.py
@@ -0,0 +1,54 @@
+# Copyright 2014-present PlatformIO <contact@platformio.org>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from os.path import join
+
+from platformio import exception
+from platformio.commands.ci import cli as cmd_ci
+
+
+def test_ci_empty(clirunner):
+    result = clirunner.invoke(cmd_ci)
+    assert result.exit_code == -1
+    assert isinstance(result.exception, exception.CIBuildEnvsEmpty)
+
+
+def test_ci_boards(clirunner, validate_cliresult):
+    result = clirunner.invoke(cmd_ci, [
+        join("examples", "atmelavr-and-arduino", "arduino-internal-libs",
+             "src", "ChatServer.ino"), "-b", "uno", "-b", "leonardo"
+    ])
+    validate_cliresult(result)
+
+
+def test_ci_project_conf(clirunner, validate_cliresult):
+    project_dir = join("examples", "atmelavr-and-arduino",
+                       "arduino-internal-libs")
+    result = clirunner.invoke(cmd_ci, [
+        join(project_dir, "src", "ChatServer.ino"), "--project-conf",
+        join(project_dir, "platformio.ini")
+    ])
+    validate_cliresult(result)
+    assert all([s in result.output for s in ("ethernet", "leonardo", "yun")])
+
+
+def test_ci_lib_and_board(clirunner, validate_cliresult):
+    example_dir = join("examples", "atmelavr-and-arduino",
+                       "arduino-external-libs")
+    result = clirunner.invoke(cmd_ci, [
+        join(example_dir, "lib", "OneWire", "examples", "DS2408_Switch",
+             "DS2408_Switch.pde"), "-l", join(example_dir, "lib", "OneWire"),
+        "-b", "uno"
+    ])
+    validate_cliresult(result)