diff --git a/freqtrade/persistence.py b/freqtrade/persistence.py
index 7c80c2e78..fd83d73e2 100644
--- a/freqtrade/persistence.py
+++ b/freqtrade/persistence.py
@@ -149,11 +149,11 @@ class Trade(_DECL_BASE):
     close_date = Column(DateTime)
     open_order_id = Column(String)
     # absolute value of the stop loss
-    stop_loss = Column(Float, nullable=False, default=0.0)
+    stop_loss = Column(Float, nullable=True, default=0.0)
     # absolute value of the initial stop loss
-    initial_stop_loss = Column(Float, nullable=False, default=0.0)
+    initial_stop_loss = Column(Float, nullable=True, default=0.0)
     # absolute value of the highest reached price
-    max_rate = Column(Float, nullable=False, default=0.0)
+    max_rate = Column(Float, nullable=True, default=0.0)
 
     def __repr__(self):
         return 'Trade(id={}, pair={}, amount={:.8f}, open_rate={:.8f}, open_since={})'.format(
diff --git a/freqtrade/tests/optimize/test_backtesting.py b/freqtrade/tests/optimize/test_backtesting.py
index 3db4a042c..026d4b62f 100644
--- a/freqtrade/tests/optimize/test_backtesting.py
+++ b/freqtrade/tests/optimize/test_backtesting.py
@@ -95,8 +95,7 @@ def simple_backtest(config, contour, num_results, mocker) -> None:
             'stake_amount': config['stake_amount'],
             'processed': processed,
             'max_open_trades': 1,
-            'realistic': True,
-            'trailing_stop' : False
+            'realistic': True
         }
     )
 
diff --git a/freqtrade/tests/strategy/test_strategy.py b/freqtrade/tests/strategy/test_strategy.py
index 21d4240ff..f8c271a30 100644
--- a/freqtrade/tests/strategy/test_strategy.py
+++ b/freqtrade/tests/strategy/test_strategy.py
@@ -33,7 +33,8 @@ def test_load_strategy_custom_directory(result):
     if os.name == 'nt':
         with pytest.raises(
                 FileNotFoundError,
-                match="FileNotFoundError: [WinError 3] The system cannot find the path specified: '{}'".format(extra_dir)):
+                match="FileNotFoundError: [WinError 3] The system cannot find the "
+                      "path specified: '{}'".format(extra_dir)):
             resolver._load_strategy('TestStrategy', extra_dir)
     else:
         with pytest.raises(
diff --git a/freqtrade/tests/test_persistence.py b/freqtrade/tests/test_persistence.py
index 3e0f50fbb..3a47c2d56 100644
--- a/freqtrade/tests/test_persistence.py
+++ b/freqtrade/tests/test_persistence.py
@@ -444,6 +444,8 @@ def test_migrate_new(default_conf, fee):
                                 close_profit FLOAT,
                                 stake_amount FLOAT NOT NULL,
                                 amount FLOAT,
+                                initial_stop_loss FLOAT,
+                                max_rate FLOAT,
                                 open_date DATETIME NOT NULL,
                                 close_date DATETIME,
                                 open_order_id VARCHAR,