diff --git a/HISTORY.rst b/HISTORY.rst
index 3bf2be9e..cfd7e12e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,6 +3,9 @@
 Release History
 ===============
 
+0.1.15
+++++++
+* `sys.exit(0)` when no tests need to run instead of raising CLIError
 
 0.1.14
 ++++++
diff --git a/azdev/__init__.py b/azdev/__init__.py
index 3901bff7..64058b4a 100644
--- a/azdev/__init__.py
+++ b/azdev/__init__.py
@@ -4,4 +4,4 @@
 # license information.
 # -----------------------------------------------------------------------------
 
-__VERSION__ = '0.1.14'
+__VERSION__ = '0.1.15'
diff --git a/azdev/operations/tests/__init__.py b/azdev/operations/tests/__init__.py
index 17c76041..53427a50 100644
--- a/azdev/operations/tests/__init__.py
+++ b/azdev/operations/tests/__init__.py
@@ -99,9 +99,12 @@ def _find_test(index, name):
             logger.warning("'%s' not found. If newly added, re-run with --discover", t)
             continue
 
+    exit_code = 0
+
     # Tests have been collected. Now run them.
     if not test_paths:
-        raise CLIError('No tests selected to run.')
+        logger.warning('No tests selected to run.')
+        sys.exit(exit_code)
 
     exit_code = 0
     with ProfileContext(profile):