diff --git a/freqtrade/commands/__init__.py b/freqtrade/commands/__init__.py
index 8339486fb..dcb814c50 100644
--- a/freqtrade/commands/__init__.py
+++ b/freqtrade/commands/__init__.py
@@ -1,5 +1,6 @@
 # flake8: noqa: F401
 
+from freqtrade.commands.arguments import Arguments
 from freqtrade.commands.data_commands import start_download_data
 from freqtrade.commands.deploy_commands import (start_create_userdir,
                                                 start_new_hyperopt,
diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py
index 21800e821..724814554 100644
--- a/freqtrade/commands/arguments.py
+++ b/freqtrade/commands/arguments.py
@@ -7,7 +7,7 @@ from pathlib import Path
 from typing import Any, Dict, List, Optional
 
 from freqtrade import constants
-from freqtrade.configuration.cli_options import AVAILABLE_CLI_OPTIONS
+from freqtrade.commands.cli_options import AVAILABLE_CLI_OPTIONS
 
 ARGS_COMMON = ["verbosity", "logfile", "version", "config", "datadir", "user_data_dir"]
 
diff --git a/freqtrade/commands/cli_options.py b/freqtrade/commands/cli_options.py
index 1807cd591..490f26cfa 100644
--- a/freqtrade/commands/cli_options.py
+++ b/freqtrade/commands/cli_options.py
@@ -1,7 +1,7 @@
 """
 Definition of cli arguments used in arguments.py
 """
-import argparse
+from argparse import ArgumentTypeError
 
 from freqtrade import __version__, constants
 
@@ -12,7 +12,7 @@ def check_int_positive(value: str) -> int:
         if uint <= 0:
             raise ValueError
     except ValueError:
-        raise argparse.ArgumentTypeError(
+        raise ArgumentTypeError(
             f"{value} is invalid for this parameter, should be a positive integer value"
         )
     return uint
@@ -24,7 +24,7 @@ def check_int_nonzero(value: str) -> int:
         if uint == 0:
             raise ValueError
     except ValueError:
-        raise argparse.ArgumentTypeError(
+        raise ArgumentTypeError(
             f"{value} is invalid for this parameter, should be a non-zero integer value"
         )
     return uint
diff --git a/freqtrade/configuration/__init__.py b/freqtrade/configuration/__init__.py
index a631609d7..54fc4e427 100644
--- a/freqtrade/configuration/__init__.py
+++ b/freqtrade/configuration/__init__.py
@@ -1,6 +1,5 @@
 # flake8: noqa: F401
 
-from freqtrade.configuration.arguments import Arguments
 from freqtrade.configuration.check_exchange import check_exchange, remove_credentials
 from freqtrade.configuration.timerange import TimeRange
 from freqtrade.configuration.configuration import Configuration
diff --git a/freqtrade/main.py b/freqtrade/main.py
index 811e29864..a75eeebed 100755
--- a/freqtrade/main.py
+++ b/freqtrade/main.py
@@ -14,7 +14,7 @@ if sys.version_info < (3, 6):
 import logging
 from typing import Any, List
 
-from freqtrade.configuration import Arguments
+from freqtrade.commands import Arguments
 
 
 logger = logging.getLogger('freqtrade')
diff --git a/tests/conftest.py b/tests/conftest.py
index 295c91f56..395388f73 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -14,7 +14,7 @@ import pytest
 from telegram import Chat, Message, Update
 
 from freqtrade import constants, persistence
-from freqtrade.configuration import Arguments
+from freqtrade.commands import Arguments
 from freqtrade.data.converter import parse_ticker_dataframe
 from freqtrade.edge import Edge, PairInfo
 from freqtrade.exchange import Exchange
diff --git a/tests/test_arguments.py b/tests/test_arguments.py
index d8fbace0f..60da0082a 100644
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@@ -5,8 +5,8 @@ from unittest.mock import MagicMock
 
 import pytest
 
-from freqtrade.configuration import Arguments
-from freqtrade.configuration.cli_options import check_int_positive
+from freqtrade.commands import Arguments
+from freqtrade.commands.cli_options import check_int_positive
 
 
 # Parse common command-line-arguments. Used for all tools
diff --git a/tests/test_configuration.py b/tests/test_configuration.py
index cbcd6416a..74de166c1 100644
--- a/tests/test_configuration.py
+++ b/tests/test_configuration.py
@@ -10,7 +10,8 @@ from unittest.mock import MagicMock
 import pytest
 from jsonschema import ValidationError
 
-from freqtrade.configuration import (Arguments, Configuration, check_exchange,
+from freqtrade.commands import Arguments
+from freqtrade.configuration import (Configuration, check_exchange,
                                      remove_credentials,
                                      validate_config_consistency)
 from freqtrade.configuration.config_validation import validate_config_schema
diff --git a/tests/test_main.py b/tests/test_main.py
index 462ac6427..1229f748a 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -5,7 +5,7 @@ from unittest.mock import MagicMock, PropertyMock
 
 import pytest
 
-from freqtrade.configuration import Arguments
+from freqtrade.commands import Arguments
 from freqtrade.exceptions import OperationalException, FreqtradeException
 from freqtrade.freqtradebot import FreqtradeBot
 from freqtrade.main import main