diff --git a/tests/plugins/test_pairlist.py b/tests/plugins/test_pairlist.py
index df48d4b98..b1fed192b 100644
--- a/tests/plugins/test_pairlist.py
+++ b/tests/plugins/test_pairlist.py
@@ -2306,7 +2306,7 @@ def test_MarketCapPairList_filter(
     )
 
     mocker.patch(
-        "freqtrade.plugins.pairlist.MarketCapPairList.CoinGeckoAPI.get_coins_markets",
+        "freqtrade.plugins.pairlist.MarketCapPairList.FtCoinGeckoApi.get_coins_markets",
         return_value=test_value,
     )
 
@@ -2344,7 +2344,7 @@ def test_MarketCapPairList_timing(mocker, default_conf_usdt, markets, time_machi
     )
 
     mocker.patch(
-        "freqtrade.plugins.pairlist.MarketCapPairList.CoinGeckoAPI.get_coins_markets",
+        "freqtrade.plugins.pairlist.MarketCapPairList.FtCoinGeckoApi.get_coins_markets",
         return_value=test_value,
     )
 
diff --git a/tests/rpc/test_rpc.py b/tests/rpc/test_rpc.py
index e91aa85c6..a0c235cd5 100644
--- a/tests/rpc/test_rpc.py
+++ b/tests/rpc/test_rpc.py
@@ -266,7 +266,7 @@ def test_rpc_status_table(default_conf, ticker, fee, mocker) -> None:
     assert "-0.00" == f"{fiat_profit_sum:.2f}"
 
     # Test with fiat convert
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
     result, headers, fiat_profit_sum = rpc._rpc_status_table(default_conf["stake_currency"], "USD")
     assert "Since" in headers
     assert "Pair" in headers
@@ -312,7 +312,7 @@ def test__rpc_timeunit_profit(
     fiat_display_currency = default_conf_usdt["fiat_display_currency"]
 
     rpc = RPC(freqtradebot)
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
 
     # Try valid data
     days = rpc._rpc_timeunit_profit(7, stake_currency, fiat_display_currency)
@@ -344,7 +344,7 @@ def test_rpc_trade_history(mocker, default_conf, markets, fee, is_short):
     freqtradebot = get_patched_freqtradebot(mocker, default_conf)
     create_mock_trades(fee, is_short)
     rpc = RPC(freqtradebot)
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
     trades = rpc._rpc_trade_history(2)
     assert len(trades["trades"]) == 2
     assert trades["trades_count"] == 2
@@ -434,7 +434,7 @@ def test_rpc_trade_statistics(default_conf_usdt, ticker, fee, mocker) -> None:
     fiat_display_currency = default_conf_usdt["fiat_display_currency"]
 
     rpc = RPC(freqtradebot)
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
 
     res = rpc._rpc_trade_statistics(stake_currency, fiat_display_currency)
     assert res["trade_count"] == 0
@@ -509,7 +509,7 @@ def test_rpc_balance_handle_error(default_conf, mocker):
     freqtradebot = get_patched_freqtradebot(mocker, default_conf)
     patch_get_signal(freqtradebot)
     rpc = RPC(freqtradebot)
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
     with pytest.raises(RPCException, match="Error getting current tickers."):
         rpc._rpc_balance(default_conf["stake_currency"], default_conf["fiat_display_currency"])
 
@@ -578,7 +578,7 @@ def test_rpc_balance_handle(default_conf_usdt, mocker, tickers):
     freqtradebot = get_patched_freqtradebot(mocker, default_conf_usdt)
     patch_get_signal(freqtradebot)
     rpc = RPC(freqtradebot)
-    rpc._fiat_converter = CryptoToFiatConverter()
+    rpc._fiat_converter = CryptoToFiatConverter({})
 
     result = rpc._rpc_balance(
         default_conf_usdt["stake_currency"], default_conf_usdt["fiat_display_currency"]