diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 354a6361b7..f8cdf9a560 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -416,6 +416,7 @@ SUBDIR_PYTHON_CFLAGS =
 
 SUBDIR_UNITTESTS_SRCS = \
 	unittests/array-view-selftests.c \
+	unittests/cli-utils-selftests.c \
 	unittests/common-utils-selftests.c \
 	unittests/environ-selftests.c \
 	unittests/format_pieces-selftests.c \
diff --git a/gdb/unittests/cli-utils-selftests.c b/gdb/unittests/cli-utils-selftests.c
new file mode 100644
index 0000000000..99414f097e
--- /dev/null
+++ b/gdb/unittests/cli-utils-selftests.c
@@ -0,0 +1,220 @@
+/* Unit tests for the cli-utils.c file.
+
+   Copyright (C) 2018 Free Software Foundation, Inc.
+
+   This file is part of GDB.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+#include "defs.h"
+#include "cli/cli-utils.h"
+#include "selftest.h"
+
+namespace selftests {
+namespace cli_utils {
+
+static void
+test_number_or_range_parser ()
+{
+  number_or_range_parser one ("1");
+
+  SELF_CHECK (one.finished () == false);
+  SELF_CHECK (one.get_number () == 1);
+  SELF_CHECK (one.finished () == true);
+  SELF_CHECK (strcmp (one.cur_tok (), "") == 0);
+
+  number_or_range_parser one_after ("1 after");
+
+  SELF_CHECK (one_after.finished () == false);
+  SELF_CHECK (one_after.get_number () == 1);
+  SELF_CHECK (one_after.finished () == true);
+  SELF_CHECK (strcmp (one_after.cur_tok (), "after") == 0);
+
+  number_or_range_parser one_three ("1-3");
+
+  for (int i = 1; i < 4; i++) {
+    SELF_CHECK (one_three.finished () == false);
+    SELF_CHECK (one_three.get_number () == i);
+  }
+  SELF_CHECK (one_three.finished () == true);
+  SELF_CHECK (strcmp (one_three.cur_tok (), "") == 0);
+
+  number_or_range_parser one_three_after ("1-3 after");
+
+  for (int i = 1; i < 4; i++) {
+    SELF_CHECK (one_three_after.finished () == false);
+    SELF_CHECK (one_three_after.get_number () == i);
+  }
+  SELF_CHECK (one_three_after.finished () == true);
+  SELF_CHECK (strcmp (one_three_after.cur_tok (), "after") == 0);
+
+  number_or_range_parser minus_one ("-1");
+
+  SELF_CHECK (minus_one.finished () == false);
+  TRY
+    {
+      minus_one.get_number ();
+      SELF_CHECK (false);
+    }
+  CATCH (ex, RETURN_MASK_ERROR)
+    {
+      SELF_CHECK (ex.reason == RETURN_ERROR);
+      SELF_CHECK (ex.error == GENERIC_ERROR);
+      SELF_CHECK (strcmp (ex.message, "negative value") == 0);
+      SELF_CHECK (strcmp (minus_one.cur_tok (), "-1") == 0);
+    }
+  END_CATCH;
+
+  number_or_range_parser nan ("-whatever");
+
+  SELF_CHECK (nan.finished () == true);
+  SELF_CHECK (one_three_after.get_number () == 0);
+  SELF_CHECK (strcmp (nan.cur_tok (), "-whatever") == 0);
+}
+
+static void
+test_parse_flags ()
+{
+  const char *flags = "abc";
+  const char *non_flags_args = "non flags args";
+  int res;
+
+  const char *t1 = "-a -a non flags args";
+
+  SELF_CHECK (parse_flags (&t1, flags) == 1);
+  SELF_CHECK (parse_flags (&t1, flags) == 1);
+  SELF_CHECK (strcmp (t1, non_flags_args) == 0);
+
+  const char *t2 = "-c     -b -c  -b -c    non flags args";
+
+  SELF_CHECK (parse_flags (&t2, flags) == 3);
+  SELF_CHECK (parse_flags (&t2, flags) == 2);
+  SELF_CHECK (parse_flags (&t2, flags) == 3);
+  SELF_CHECK (parse_flags (&t2, flags) == 2);
+  SELF_CHECK (parse_flags (&t2, flags) == 3);
+  SELF_CHECK (strcmp (t2, non_flags_args) == 0);
+
+  const char *t3 = non_flags_args;
+
+  SELF_CHECK (parse_flags (&t3, flags) == 0);
+  SELF_CHECK (strcmp (t3, non_flags_args) == 0);
+
+  const char *t4 = "-c -b -x -y -z -c";
+  const char *orig_t4 = t4;
+
+  SELF_CHECK (parse_flags (&t4, flags) == 3);
+  SELF_CHECK (parse_flags (&t4, flags) == 2);
+  SELF_CHECK (strcmp (t4, "-x -y -z -c") == 0);
+
+  const char *t5 = "-c -cb -c";
+  const char *orig_t5 = t5;
+
+  SELF_CHECK (parse_flags (&t5, flags) == 3);
+  SELF_CHECK (parse_flags (&t5, flags) == 0);
+  SELF_CHECK (strcmp (t5, "-cb -c") == 0);
+}
+
+static void
+test_parse_flags_qcs ()
+{
+  bool quiet;
+  bool cont;
+  bool silent;
+
+  const char *non_flags_args = "non flags args";
+
+  const char *t1 = "-q -s    non flags args";
+  quiet = false;
+  cont = false;
+  silent = false;
+
+  SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t1.q",
+			       &t1,
+			       &quiet, &cont, &silent) == 1);
+  SELF_CHECK (quiet == true && cont == false && silent == false);
+  SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t1.s",
+			       &t1,
+			       &quiet, &cont, &silent) == 1);
+  SELF_CHECK (quiet == true && cont == false && silent == true);
+  SELF_CHECK (strcmp (t1, non_flags_args) == 0);
+
+  const char *t2 = "non flags args";
+  quiet = false;
+  cont = false;
+  silent = false;
+
+  SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t2",
+			       &t2,
+			       &quiet, &cont, &silent) == 0);
+  SELF_CHECK (quiet == false && cont == false && silent == false);
+  SELF_CHECK (strcmp (t2, non_flags_args) == 0);
+
+  const char *t3 = "-123 non flags args";
+  const char *orig_t3 = t3;
+  quiet = false;
+  cont = false;
+  silent = false;
+
+  SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t3",
+			       &t3,
+			       &quiet, &cont, &silent) == 0);
+  SELF_CHECK (quiet == false && cont == false && silent == false);
+  SELF_CHECK (strcmp (t3, orig_t3) == 0);
+
+  const char *t4 = "-c -s non flags args";
+  const char *orig_t4 = t4;
+  quiet = false;
+  cont = false;
+  silent = false;
+  TRY
+    {
+      SELF_CHECK (parse_flags_qcs ("test_parse_flags_qcs.t4.cs",
+				   &t4,
+				   &quiet, &cont, &silent) == 1);
+
+      (void) parse_flags_qcs ("test_parse_flags_qcs.t4.cs",
+			      &t4,
+			      &quiet, &cont, &silent);
+      SELF_CHECK (false);
+    }
+  CATCH (ex, RETURN_MASK_ERROR)
+    {
+      SELF_CHECK (ex.reason == RETURN_ERROR);
+      SELF_CHECK (ex.error == GENERIC_ERROR);
+      SELF_CHECK
+	(strcmp (ex.message,
+		 "test_parse_flags_qcs.t4.cs: "
+		 "-c and -s are mutually exclusive") == 0);
+    }
+  END_CATCH;
+
+}
+
+static void
+test_cli_utils ()
+{
+  selftests::cli_utils::test_number_or_range_parser ();
+  selftests::cli_utils::test_parse_flags ();
+  selftests::cli_utils::test_parse_flags_qcs ();
+}
+
+}
+}
+
+void
+_initialize_cli_utils_selftests ()
+{
+  selftests::register_test ("cli_utils",
+			    selftests::cli_utils::test_cli_utils);
+}
