diff --git a/wlauto/commands/create.py b/wlauto/commands/create.py
index 5c436bee..fd8e02f5 100644
--- a/wlauto/commands/create.py
+++ b/wlauto/commands/create.py
@@ -29,7 +29,7 @@ import yaml
 
 from wlauto import PluginLoader, Command, settings
 from wlauto.exceptions import CommandError, ConfigError
-from wlauto.utils.cli import init_argument_parser
+from wlauto.core.command import init_argument_parser
 from wlauto.utils.misc import (capitalize, check_output,
                                ensure_file_directory_exists as _f, ensure_directory_exists as _d)
 from wlauto.utils.types import identifier
diff --git a/wlauto/core/command.py b/wlauto/core/command.py
index 51e98c88..c2e83c78 100644
--- a/wlauto/core/command.py
+++ b/wlauto/core/command.py
@@ -16,8 +16,16 @@
 import textwrap
 
 from wlauto.core.plugin import Plugin
-from wlauto.core.entry_point import init_argument_parser
 from wlauto.utils.doc import format_body
+from wlauto.core.version import get_wa_version
+
+
+def init_argument_parser(parser):
+    parser.add_argument('-c', '--config', help='specify an additional config.py')
+    parser.add_argument('-v', '--verbose', action='count',
+                        help='The scripts will produce verbose output.')
+    parser.add_argument('--version', action='version', version='%(prog)s {}'.format(get_wa_version()))
+    return parser
 
 
 class Command(Plugin):
diff --git a/wlauto/core/entry_point.py b/wlauto/core/entry_point.py
index 5c16f43e..09cbfece 100644
--- a/wlauto/core/entry_point.py
+++ b/wlauto/core/entry_point.py
@@ -23,10 +23,10 @@ import warnings
 
 from wlauto.core.configuration import settings
 from wlauto.core import pluginloader
+from wlauto.core.command import init_argument_parser
 from wlauto.exceptions import WAError, ConfigError
 from wlauto.utils.misc import get_traceback
 from wlauto.utils.log import init_logging
-from wlauto.utils.cli import init_argument_parser
 from wlauto.utils.doc import format_body
 
 from devlib import DevlibError
diff --git a/wlauto/utils/cli.py b/wlauto/utils/cli.py
deleted file mode 100644
index 6ab3c11a..00000000
--- a/wlauto/utils/cli.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#    Copyright 2014-2015 ARM Limited
-#
-# 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 wlauto.core.version import get_wa_version
-
-
-def init_argument_parser(parser):
-    parser.add_argument('-c', '--config', help='specify an additional config.py')
-    parser.add_argument('-v', '--verbose', action='count',
-                        help='The scripts will produce verbose output.')
-    parser.add_argument('--version', action='version', version='%(prog)s {}'.format(get_wa_version()))
-    return parser