diff --git a/freqtrade/tests/conftest.py b/freqtrade/tests/conftest.py
index cbaca6c04..b93140860 100644
--- a/freqtrade/tests/conftest.py
+++ b/freqtrade/tests/conftest.py
@@ -780,10 +780,11 @@ def buy_order_fee():
         'fee': None
     }
 
+
 @pytest.fixture(scope="function")
 def edge_conf(default_conf):
     default_conf['edge'] = {
-        "enabled": False,
+        "enabled": True,
         "process_throttle_secs": 1800,
         "calculate_since_number_of_days": 14,
         "total_capital_in_stake_currency": 0.5,
diff --git a/freqtrade/tests/edge/test_edge.py b/freqtrade/tests/edge/test_edge.py
index aa45ddfff..a7b1882a5 100644
--- a/freqtrade/tests/edge/test_edge.py
+++ b/freqtrade/tests/edge/test_edge.py
@@ -75,15 +75,15 @@ tc3 = BTContainer(data=[
     trades=[BTrade(sell_reason=SellType.STOP_LOSS, open_tick=1, close_tick=1)]
 )
 
-#5) Stoploss and sell are hit. should sell on stoploss
-tc4=BTContainer(data = [
+# 5) Stoploss and sell are hit. should sell on stoploss
+tc4 = BTContainer(data=[
     # D  O     H     L     C     V    B  S
     [0, 5000, 5025, 4975, 4987, 6172, 1, 0],
     [1, 5000, 5025, 4800, 4987, 6172, 0, 1],  # enter trade, stoploss hit, sell signal
     [2, 5000, 5025, 4975, 4987, 6172, 0, 0],
 ],
-    stop_loss = -0.03, roi = float('inf'), profit_perc = -0.03,
-    trades = [BTrade(sell_reason=SellType.STOP_LOSS, open_tick=1, close_tick=1)]
+    stop_loss=-0.03, roi=float('inf'), profit_perc=-0.03,
+    trades=[BTrade(sell_reason=SellType.STOP_LOSS, open_tick=1, close_tick=1)]
 )
 
 TESTS = [
diff --git a/freqtrade/tests/optimize/__init__.py b/freqtrade/tests/optimize/__init__.py
index 2b7222e88..3d3066950 100644
--- a/freqtrade/tests/optimize/__init__.py
+++ b/freqtrade/tests/optimize/__init__.py
@@ -31,7 +31,7 @@ class BTContainer(NamedTuple):
 
 def _get_frame_time_from_offset(offset):
     return ticker_start_time.shift(
-        minutes=(offset * ticker_interval_in_minute)).datetime
+        minutes=(offset * ticker_interval_in_minute)).datetime.replace(tzinfo=None)
 
 
 def _build_backtest_dataframe(ticker_with_signals):
diff --git a/freqtrade/tests/test_freqtradebot.py b/freqtrade/tests/test_freqtradebot.py
index 9c72f9177..907d228d6 100644
--- a/freqtrade/tests/test_freqtradebot.py
+++ b/freqtrade/tests/test_freqtradebot.py
@@ -246,12 +246,11 @@ def test_get_trade_stake_amount_unlimited_amount(default_conf,
     assert result is None
 
 
-def test_edge_overrides_stake_amount(mocker, default_conf) -> None:
-    default_conf['edge']['enabled'] = True
+def test_edge_overrides_stake_amount(mocker, edge_conf) -> None:
     patch_RPCManager(mocker)
     patch_exchange(mocker)
     patch_edge(mocker)
-    freqtrade = FreqtradeBot(default_conf)
+    freqtrade = FreqtradeBot(edge_conf)
 
     # strategy stoploss should be ignored
     freqtrade.strategy.stoploss = -0.05
@@ -261,14 +260,8 @@ def test_edge_overrides_stake_amount(mocker, default_conf) -> None:
     assert freqtrade._get_trade_stake_amount('LTC/BTC') == 0.02381
 
 
-def test_edge_overrides_stoploss(
-        limit_buy_order,
-        fee,
-        markets,
-        caplog,
-        mocker,
-        default_conf) -> None:
-    default_conf['edge']['enabled'] = True
+def test_edge_overrides_stoploss(limit_buy_order, fee, markets, caplog, mocker, edge_conf) -> None:
+
     patch_RPCManager(mocker)
     patch_exchange(mocker)
     patch_edge(mocker)
@@ -292,7 +285,8 @@ def test_edge_overrides_stoploss(
     #############################################
 
     # Create a trade with "limit_buy_order" price
-    freqtrade = FreqtradeBot(default_conf)
+    freqtrade = FreqtradeBot(edge_conf)
+    freqtrade.active_pair_whitelist = ['NEO/BTC']
     patch_get_signal(freqtrade)
     freqtrade.strategy.min_roi_reached = lambda trade, current_profit, current_time: False
     freqtrade.create_trade()
@@ -302,14 +296,12 @@ def test_edge_overrides_stoploss(
 
     # stoploss shoud be hit
     assert freqtrade.handle_trade(trade) is True
-
     assert log_has('executed sell, reason: SellType.STOP_LOSS', caplog.record_tuples)
     assert trade.sell_reason == SellType.STOP_LOSS.value
 
 
 def test_edge_should_ignore_strategy_stoploss(limit_buy_order, fee, markets,
-                                              mocker, default_conf) -> None:
-    default_conf['edge']['enabled'] = True
+                                              mocker, edge_conf) -> None:
     patch_RPCManager(mocker)
     patch_exchange(mocker)
     patch_edge(mocker)
@@ -333,7 +325,8 @@ def test_edge_should_ignore_strategy_stoploss(limit_buy_order, fee, markets,
     #############################################
 
     # Create a trade with "limit_buy_order" price
-    freqtrade = FreqtradeBot(default_conf)
+    freqtrade = FreqtradeBot(edge_conf)
+    freqtrade.active_pair_whitelist = ['NEO/BTC']
     patch_get_signal(freqtrade)
     freqtrade.strategy.min_roi_reached = lambda trade, current_profit, current_time: False
     freqtrade.create_trade()
@@ -341,7 +334,7 @@ def test_edge_should_ignore_strategy_stoploss(limit_buy_order, fee, markets,
     trade.update(limit_buy_order)
     #############################################
 
-    # stoploss shoud be hit
+    # stoploss shoud not be hit
     assert freqtrade.handle_trade(trade) is False