diff --git a/tests/test_utils.py b/tests/test_utils.py
index 91009ec42..c686d2117 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -451,8 +451,8 @@ def test_create_datadir(caplog, mocker):
     # Added assert here to analyze random test-failures ...
     assert len(caplog.record_tuples) == 0
 
-    cud = mocker.patch("freqtrade.commands.create_userdata_dir", MagicMock())
-    csf = mocker.patch("freqtrade.commands.copy_sample_files", MagicMock())
+    cud = mocker.patch("freqtrade.commands.deploy_commands.create_userdata_dir", MagicMock())
+    csf = mocker.patch("freqtrade.commands.deploy_commands.copy_sample_files", MagicMock())
     args = [
         "create-userdir",
         "--userdir",
@@ -538,7 +538,7 @@ def test_start_new_hyperopt_no_arg(mocker, caplog):
 
 
 def test_download_data_keyboardInterrupt(mocker, caplog, markets):
-    dl_mock = mocker.patch('freqtrade.commands.refresh_backtest_ohlcv_data',
+    dl_mock = mocker.patch('freqtrade.commands.utils.refresh_backtest_ohlcv_data',
                            MagicMock(side_effect=KeyboardInterrupt))
     patch_exchange(mocker)
     mocker.patch(
@@ -556,7 +556,7 @@ def test_download_data_keyboardInterrupt(mocker, caplog, markets):
 
 
 def test_download_data_no_markets(mocker, caplog):
-    dl_mock = mocker.patch('freqtrade.commands.refresh_backtest_ohlcv_data',
+    dl_mock = mocker.patch('freqtrade.commands.utils.refresh_backtest_ohlcv_data',
                            MagicMock(return_value=["ETH/BTC", "XRP/BTC"]))
     patch_exchange(mocker, id='binance')
     mocker.patch(
@@ -574,7 +574,7 @@ def test_download_data_no_markets(mocker, caplog):
 
 
 def test_download_data_no_exchange(mocker, caplog):
-    mocker.patch('freqtrade.commands.refresh_backtest_ohlcv_data',
+    mocker.patch('freqtrade.commands.utils.refresh_backtest_ohlcv_data',
                  MagicMock(return_value=["ETH/BTC", "XRP/BTC"]))
     patch_exchange(mocker)
     mocker.patch(
@@ -594,7 +594,7 @@ def test_download_data_no_pairs(mocker, caplog):
 
     mocker.patch.object(Path, "exists", MagicMock(return_value=False))
 
-    mocker.patch('freqtrade.commands.refresh_backtest_ohlcv_data',
+    mocker.patch('freqtrade.commands.utils.refresh_backtest_ohlcv_data',
                  MagicMock(return_value=["ETH/BTC", "XRP/BTC"]))
     patch_exchange(mocker)
     mocker.patch(
@@ -613,9 +613,9 @@ def test_download_data_no_pairs(mocker, caplog):
 
 
 def test_download_data_trades(mocker, caplog):
-    dl_mock = mocker.patch('freqtrade.commands.refresh_backtest_trades_data',
+    dl_mock = mocker.patch('freqtrade.commands.utils.refresh_backtest_trades_data',
                            MagicMock(return_value=[]))
-    convert_mock = mocker.patch('freqtrade.commands.convert_trades_to_ohlcv',
+    convert_mock = mocker.patch('freqtrade.commands.utils.convert_trades_to_ohlcv',
                                 MagicMock(return_value=[]))
     patch_exchange(mocker)
     mocker.patch(