diff --git a/.travis.yml b/.travis.yml
index 405228ab8..81c3de2fb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,11 +28,11 @@ jobs:
       name: pytest
     - script:
       - cp config.json.example config.json
-      - freqtrade --datadir tests/testdata backtesting
+      - freqtrade backtesting --datadir tests/testdata
       name: backtest
     - script:
       - cp config.json.example config.json
-      - freqtrade --datadir tests/testdata hyperopt -e 5
+      - freqtrade hyperopt --datadir tests/testdata -e 5
       name: hyperopt
     - script: flake8
       name: flake8
diff --git a/freqtrade/utils.py b/freqtrade/utils.py
index de167671f..6b2b5314b 100644
--- a/freqtrade/utils.py
+++ b/freqtrade/utils.py
@@ -58,7 +58,7 @@ def start_list_exchanges(args: Dict[str, Any]) -> None:
               f"{', '.join(available_exchanges())}")
 
 
-def start_create_userdir(args: Dict[str, Any]) -> int:
+def start_create_userdir(args: Dict[str, Any]) -> None:
     """
     Create "user_data" directory to contain user data strategies, hyperopts, ...)
     :param args: Cli args from Arguments()
diff --git a/tests/test_arguments.py b/tests/test_arguments.py
index 8cd24fe55..4e01732b3 100644
--- a/tests/test_arguments.py
+++ b/tests/test_arguments.py
@@ -1,10 +1,8 @@
 # pragma pylint: disable=missing-docstring, C0103
 import argparse
-import re
 
 import pytest
 
-from freqtrade import OperationalException
 from freqtrade.configuration import Arguments
 from freqtrade.configuration.cli_options import check_int_positive