diff --git a/build-unit-test-docker.sh b/build-unit-test-docker.sh
index d474d1e..4cb549b 100755
--- a/build-unit-test-docker.sh
+++ b/build-unit-test-docker.sh
@@ -83,6 +83,7 @@
 declare -A PKG_REV=(
   [boost]=1.66.0
   [cereal]=v1.2.2
+  [CLI11]=v1.6.1
   # Snapshot from 2018-06-14
   [googletest]=ba96d0b1161f540656efdaed035b3c062b60e006
   [json]=v3.0.1
@@ -206,6 +207,15 @@
 RUN curl -L https://github.com/USCiLab/cereal/archive/${PKG_REV['cereal']}.tar.gz | tar -xz && \
 cp -a cereal-*/include/cereal/ ${PREFIX}/include/
 
+FROM openbmc-base as openbmc-CLI11
+RUN curl -L https://github.com/CLIUtils/CLI11/archive/${PKG_REV['CLI11']}.tar.gz | tar -xz && \
+cd CLI11-* && \
+mkdir build && \
+cd build && \
+cmake ${CMAKE_FLAGS} -DCLI11_TESTING=OFF -DCLI11_EXAMPLES=OFF .. && \
+make -j$(nproc) && \
+make install
+
 FROM openbmc-base as openbmc-json
 RUN mkdir ${PREFIX}/include/nlohmann/ && \
 curl -L -o ${PREFIX}/include/nlohmann/json.hpp https://github.com/nlohmann/json/releases/download/${PKG_REV['json']}/json.hpp