diff --git a/tests/conftest.py b/tests/conftest.py
index 57122c01c..691584e74 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1019,8 +1019,8 @@ def limit_buy_order_open():
         'type': 'limit',
         'side': 'buy',
         'symbol': 'mocked',
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'datetime': arrow.utcnow().isoformat(),
-        'timestamp': arrow.utcnow().int_timestamp,
         'price': 0.00001099,
         'amount': 90.99181073,
         'filled': 0.0,
@@ -1046,6 +1046,7 @@ def market_buy_order():
         'type': 'market',
         'side': 'buy',
         'symbol': 'mocked',
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'datetime': arrow.utcnow().isoformat(),
         'price': 0.00004099,
         'amount': 91.99181073,
@@ -1062,6 +1063,7 @@ def market_sell_order():
         'type': 'market',
         'side': 'sell',
         'symbol': 'mocked',
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'datetime': arrow.utcnow().isoformat(),
         'price': 0.00004173,
         'amount': 91.99181073,
@@ -1078,7 +1080,8 @@ def limit_buy_order_old():
         'type': 'limit',
         'side': 'buy',
         'symbol': 'mocked',
-        'datetime': str(arrow.utcnow().shift(minutes=-601).datetime),
+        'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
+        'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
         'price': 0.00001099,
         'amount': 90.99181073,
         'filled': 0.0,
@@ -1094,6 +1097,7 @@ def limit_sell_order_old():
         'type': 'limit',
         'side': 'sell',
         'symbol': 'ETH/BTC',
+        'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
         'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
         'price': 0.00001099,
         'amount': 90.99181073,
@@ -1110,6 +1114,7 @@ def limit_buy_order_old_partial():
         'type': 'limit',
         'side': 'buy',
         'symbol': 'ETH/BTC',
+        'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
         'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
         'price': 0.00001099,
         'amount': 90.99181073,
@@ -1139,7 +1144,7 @@ def limit_buy_order_canceled_empty(request):
             'info': {},
             'id': '1234512345',
             'clientOrderId': None,
-            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp,
+            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
             'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
             'lastTradeTimestamp': None,
             'symbol': 'LTC/USDT',
@@ -1160,7 +1165,7 @@ def limit_buy_order_canceled_empty(request):
             'info': {},
             'id': 'AZNPFF-4AC4N-7MKTAT',
             'clientOrderId': None,
-            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp,
+            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
             'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
             'lastTradeTimestamp': None,
             'status': 'canceled',
@@ -1181,7 +1186,7 @@ def limit_buy_order_canceled_empty(request):
             'info': {},
             'id': '1234512345',
             'clientOrderId': 'alb1234123',
-            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp,
+            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
             'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
             'lastTradeTimestamp': None,
             'symbol': 'LTC/USDT',
@@ -1202,7 +1207,7 @@ def limit_buy_order_canceled_empty(request):
             'info': {},
             'id': '1234512345',
             'clientOrderId': 'alb1234123',
-            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp,
+            'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
             'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
             'lastTradeTimestamp': None,
             'symbol': 'LTC/USDT',
@@ -1228,7 +1233,7 @@ def limit_sell_order_open():
         'side': 'sell',
         'symbol': 'mocked',
         'datetime': arrow.utcnow().isoformat(),
-        'timestamp': arrow.utcnow().int_timestamp,
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'price': 0.00001173,
         'amount': 90.99181073,
         'filled': 0.0,
@@ -1890,7 +1895,8 @@ def buy_order_fee():
         'type': 'limit',
         'side': 'buy',
         'symbol': 'mocked',
-        'datetime': str(arrow.utcnow().shift(minutes=-601).datetime),
+        'timestamp': arrow.utcnow().shift(minutes=-601).int_timestamp * 1000,
+        'datetime': arrow.utcnow().shift(minutes=-601).isoformat(),
         'price': 0.245441,
         'amount': 8.0,
         'cost': 1.963528,
@@ -2188,7 +2194,7 @@ def limit_buy_order_usdt_open():
         'side': 'buy',
         'symbol': 'mocked',
         'datetime': arrow.utcnow().isoformat(),
-        'timestamp': arrow.utcnow().int_timestamp,
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'price': 2.00,
         'amount': 30.0,
         'filled': 0.0,
@@ -2215,7 +2221,7 @@ def limit_sell_order_usdt_open():
         'side': 'sell',
         'symbol': 'mocked',
         'datetime': arrow.utcnow().isoformat(),
-        'timestamp': arrow.utcnow().int_timestamp,
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'price': 2.20,
         'amount': 30.0,
         'filled': 0.0,
@@ -2240,6 +2246,7 @@ def market_buy_order_usdt():
         'type': 'market',
         'side': 'buy',
         'symbol': 'mocked',
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'datetime': arrow.utcnow().isoformat(),
         'price': 2.00,
         'amount': 30.0,
@@ -2296,6 +2303,7 @@ def market_sell_order_usdt():
         'type': 'market',
         'side': 'sell',
         'symbol': 'mocked',
+        'timestamp': arrow.utcnow().int_timestamp * 1000,
         'datetime': arrow.utcnow().isoformat(),
         'price': 2.20,
         'amount': 30.0,